From 7057adc05537dc47c43125784a93171657eacedf Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 19 4月 2015 23:37:47 +0800
Subject: [PATCH] Merge branch 'master' of git://github.com/andrey-nakin/scpi-parser into andrey-nakin-master

---
 libscpi/inc/scpi/config.h |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/libscpi/inc/scpi/config.h b/libscpi/inc/scpi/config.h
index aee1951..ca9ee89 100644
--- a/libscpi/inc/scpi/config.h
+++ b/libscpi/inc/scpi/config.h
@@ -64,8 +64,9 @@
 #endif
 
 /* AVR libc */
-#if defined(__AVR_LIBC_VERSION__)
-#define HAVE_DTOSTRE
+#if defined(__AVR__)
+#include <stdlib.h>
+#define HAVE_DTOSTRE            1
 #endif
 
 /* ======== test strnlen ======== */
@@ -98,7 +99,25 @@
 #endif
 
 #if HAVE_DTOSTRE
-#define SCPI_doubleToStr(v, s, l) strlen(dtostre((v), (s), 6, DTOSTR_PLUS_SIGN | DTOSTRE_ALWAYS_SIGN | DTOSTR_UPPERCASE))
+char * dtostre(
+	double __val,
+	char * __s,
+	unsigned char __prec,
+	unsigned char __flags);
+
+#ifndef DTOSTR_ALWAYS_SIGN
+#define	DTOSTR_ALWAYS_SIGN 0x01
+#endif
+
+#ifndef DTOSTR_PLUS_SIGN
+#define	DTOSTR_PLUS_SIGN 0x02
+#endif
+
+#ifndef DTOSTR_UPPERCASE
+#define	DTOSTR_UPPERCASE 0x04
+#endif
+
+#define SCPI_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))
 #endif

--
Gitblit v1.9.1