From 6054f2efebb898bbd32ab7388eae7b9ff4357b0a Mon Sep 17 00:00:00 2001
From: Andrey Nakin <andrey.nakin@gmail.com>
Date: 周一, 21 10月 2013 03:50:04 +0800
Subject: [PATCH] Merge remote branch 'upstream/master'
---
libscpi/inc/scpi/types.h | 8 ++++++--
libscpi/src/parser.c | 2 +-
libscpi/inc/scpi/config.h | 8 ++++++++
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/libscpi/inc/scpi/config.h b/libscpi/inc/scpi/config.h
index de27110..3b8ccda 100644
--- a/libscpi/inc/scpi/config.h
+++ b/libscpi/inc/scpi/config.h
@@ -41,6 +41,14 @@
extern "C" {
#endif
+/* Compiler specific */
+
+/* PIC24 */
+#if defined(__C30__)
+#define HAVE_STRNLEN 0
+#define HAVE_STRNCASECMP 0
+#endif
+
/* ======== test strnlen ======== */
#ifndef HAVE_STRNLEN
#define HAVE_STRNLEN 1
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index dff7991..4202751 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -47,8 +47,12 @@
extern "C" {
#endif
-#define FALSE false
-#define TRUE true
+#ifndef FALSE
+ #define FALSE 0
+#endif
+#ifndef TRUE
+ #define TRUE (!FALSE)
+#endif
/* basic data types */
typedef bool bool_t;
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index fb6396f..b036fb0 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -579,7 +579,7 @@
}
/**
- * Parse boolean parameter
+ * Parse boolean parameter as described in the spec SCPI-99 7.3 Boolean Program Data
* @param context
* @param value
* @param mandatory
--
Gitblit v1.9.1