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 |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libscpi/inc/scpi/config.h b/libscpi/inc/scpi/config.h
index 92b544b..ca9ee89 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
 
@@ -98,15 +99,14 @@
 #endif
 
 #if HAVE_DTOSTRE
-
 char * dtostre(
 	double __val,
 	char * __s,
 	unsigned char __prec,
 	unsigned char __flags);
 
-#ifndef DTOSTRE_ALWAYS_SIGN
-#define	DTOSTRE_ALWAYS_SIGN 0x01
+#ifndef DTOSTR_ALWAYS_SIGN
+#define	DTOSTR_ALWAYS_SIGN 0x01
 #endif
 
 #ifndef DTOSTR_PLUS_SIGN
@@ -117,7 +117,7 @@
 #define	DTOSTR_UPPERCASE 0x04
 #endif
 
-#define SCPI_doubleToStr(v, s, l) strlen(dtostre((v), (s), 6, DTOSTR_PLUS_SIGN | DTOSTRE_ALWAYS_SIGN | DTOSTR_UPPERCASE))
+#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