From be752f9c9139f8d70d0296c6a9f49003071c8c3c Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 24 12月 2012 23:29:54 +0800
Subject: [PATCH] Reorganize library
---
libscpi/src/utils.h | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/scpi/scpi_utils.h b/libscpi/src/utils.h
similarity index 80%
rename from scpi/scpi_utils.h
rename to libscpi/src/utils.h
index 7da171a..7429246 100644
--- a/scpi/scpi_utils.h
+++ b/libscpi/src/utils.h
@@ -38,22 +38,24 @@
#define SCPI_UTILS_H
#include <stdint.h>
-#include "scpi_types.h"
+#include "scpi/types.h"
#ifdef __cplusplus
extern "C" {
#endif
- char * strnpbrk(const char *str, size_t size, const char *set);
- bool_t compareStr(const char * str1, size_t len1, const char * str2, size_t len2);
- size_t longToStr(int32_t val, char * str, size_t len);
- size_t doubleToStr(double val, char * str, size_t len);
- size_t strToLong(const char * str, int32_t * val);
- size_t strToDouble(const char * str, double * val);
- bool_t locateText(const char * str1, size_t len1, char ** str2, size_t * len2);
- bool_t locateStr(const char * str1, size_t len1, char ** str2, size_t * len2);
- size_t skipWhitespace(const char * cmd, size_t len);
- bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len);
+ #define LOCAL __attribute__((visibility ("hidden")))
+
+ char * strnpbrk(const char *str, size_t size, const char *set) LOCAL;
+ bool_t compareStr(const char * str1, size_t len1, const char * str2, size_t len2) LOCAL;
+ size_t longToStr(int32_t val, char * str, size_t len) LOCAL;
+ size_t doubleToStr(double val, char * str, size_t len) LOCAL;
+ size_t strToLong(const char * str, int32_t * val) LOCAL;
+ size_t strToDouble(const char * str, double * val) LOCAL;
+ bool_t locateText(const char * str1, size_t len1, char ** str2, size_t * len2) LOCAL;
+ bool_t locateStr(const char * str1, size_t len1, char ** str2, size_t * len2) LOCAL;
+ size_t skipWhitespace(const char * cmd, size_t len) LOCAL;
+ bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len) LOCAL;
#define max(a,b) \
--
Gitblit v1.9.1