From 09bdc2f78dbaf5fc659cb9417b46b848a61aab7c Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 22 2月 2017 18:47:02 +0800
Subject: [PATCH] Merge pull request #84 from Yorkshire-Jack/master
---
libscpi/inc/scpi/types.h | 7 ++++++-
libscpi/inc/scpi/cc.h | 2 ++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/libscpi/inc/scpi/cc.h b/libscpi/inc/scpi/cc.h
index f4a8d38..1742134 100644
--- a/libscpi/inc/scpi/cc.h
+++ b/libscpi/inc/scpi/cc.h
@@ -116,6 +116,8 @@
#if defined(__AVR__)
#include <stdlib.h>
#define HAVE_DTOSTRE 1
+#undef HAVE_STRTOF
+#define HAVE_STRTOF 0
#endif
/* default values */
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 1a49402..334843a 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -113,7 +113,12 @@
typedef struct _scpi_command_t scpi_command_t;
-#define SCPI_CMD_LIST_END {NULL, NULL, 0}
+#if USE_COMMAND_TAGS
+ #define SCPI_CMD_LIST_END {NULL, NULL, 0}
+#else
+ #define SCPI_CMD_LIST_END {NULL, NULL}
+#endif
+
/* scpi interface */
typedef struct _scpi_t scpi_t;
--
Gitblit v1.9.1