From 94ccbc305cac38eb9c54384b9f47d3da6527299b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周六, 25 4月 2015 22:29:42 +0800
Subject: [PATCH] Solve #16 Multiple Identical Capabilities

---
 libscpi/inc/scpi/config.h |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libscpi/inc/scpi/config.h b/libscpi/inc/scpi/config.h
index 177a5bb..811d5a4 100644
--- a/libscpi/inc/scpi/config.h
+++ b/libscpi/inc/scpi/config.h
@@ -64,7 +64,8 @@
 #endif
 
 /* AVR libc */
-#if defined(__AVR_LIBC_VERSION__)
+#if defined(__AVR__)
+#include <stdlib.h>
 #define HAVE_DTOSTRE            1
 #endif
 
@@ -83,24 +84,24 @@
 
 /* define local macros depending on existance of strnlen */
 #if HAVE_STRNLEN
-#define SCPI_strnlen(s, l)	strnlen((s), (l))
+#define SCPIDEFINE_strnlen(s, l)	strnlen((s), (l))
 #else
-#define SCPI_strnlen(s, l)	BSD_strnlen((s), (l))
+#define SCPIDEFINE_strnlen(s, l)	BSD_strnlen((s), (l))
 #endif
 
 /* define local macros depending on existance of strncasecmp and strnicmp */
 #if HAVE_STRNCASECMP
-#define SCPI_strncasecmp(s1, s2, l)	strncasecmp((s1), (s2), (l))
+#define SCPIDEFINE_strncasecmp(s1, s2, l) strncasecmp((s1), (s2), (l))
 #elif HAVE_STRNICMP
-#define SCPI_strncasecmp(s1, s2, l)     strnicmp((s1), (s2), (l))
+#define SCPIDEFINE_strncasecmp(s1, s2, l) strnicmp((s1), (s2), (l))
 #else
-#define SCPI_strncasecmp(s1, s2, l)	OUR_strncasecmp((s1), (s2), (l))
+#define SCPIDEFINE_strncasecmp(s1, s2, l) OUR_strncasecmp((s1), (s2), (l))
 #endif
 
 #if HAVE_DTOSTRE
-#define SCPI_doubleToStr(v, s, l) strlen(dtostre((v), (s), 6, DTOSTR_PLUS_SIGN | DTOSTRE_ALWAYS_SIGN | DTOSTR_UPPERCASE))
+#define SCPIDEFINE_doubleToStr(v, s, l) strlen(dtostre((v), (s), 6, DTOSTR_PLUS_SIGN | DTOSTR_ALWAYS_SIGN | DTOSTR_UPPERCASE))
 #else
-#define SCPI_doubleToStr(v, s, l) snprintf((s), (l), "%lg", (v))
+#define SCPIDEFINE_doubleToStr(v, s, l) snprintf((s), (l), "%lg", (v))
 #endif
 
 

--
Gitblit v1.9.1