From 219ca4fc80ef6491555b403c6884566c8e1deefd Mon Sep 17 00:00:00 2001
From: Rich Barlow <rich@bennellick.com>
Date: 周一, 10 4月 2017 18:38:40 +0800
Subject: [PATCH] Don't reference malloc if not using alloc/free
---
libscpi/inc/scpi/cc.h | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/libscpi/inc/scpi/cc.h b/libscpi/inc/scpi/cc.h
index 0ad081e..1742134 100644
--- a/libscpi/inc/scpi/cc.h
+++ b/libscpi/inc/scpi/cc.h
@@ -59,11 +59,11 @@
#endif
#if _BSD_SOURCE || _XOPEN_SOURCE >= 500 || _ISOC99_SOURCE || _POSIX_C_SOURCE >= 200112L || C99
-#define HAVE_SNPRINTF 1
+ #define HAVE_SNPRINTF 1
#endif
#if _POSIX_C_SOURCE >= 200112L
-#define HAVE_STRNCASECMP 1
+ #define HAVE_STRNCASECMP 1
#endif
#if _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE || _ISOC99_SOURCE || _POSIX_C_SOURCE >= 200112L || C99
@@ -83,6 +83,10 @@
#define HAVE_STRTOF 1
#endif
+#if _ISOC99_SOURCE || C99
+ #define HAVE_STDBOOL 1
+#endif
+
/* Compiler specific */
/* RealView/Keil ARM Compiler, e.g. Cortex-M CPUs */
#if defined(__CC_ARM)
@@ -92,7 +96,6 @@
/* National Instruments (R) CVI x86/x64 PC platform */
#if defined(_CVI_)
#define HAVE_STRNICMP 1
-#define HAVE_STDBOOL 0
#endif
/* 8bit PIC - PIC16, etc */
@@ -113,8 +116,11 @@
#if defined(__AVR__)
#include <stdlib.h>
#define HAVE_DTOSTRE 1
+#undef HAVE_STRTOF
+#define HAVE_STRTOF 0
#endif
+/* default values */
#ifndef HAVE_STRNLEN
#define HAVE_STRNLEN 0
#endif
@@ -128,35 +134,39 @@
#endif
#ifndef HAVE_STDBOOL
-#define HAVE_STDBOOL 1
+#define HAVE_STDBOOL 0
#endif
#ifndef HAVE_SNPRINTF
-#define HAVE_SNPRINTF 0
+#define HAVE_SNPRINTF 0
#endif
#ifndef HAVE_STRNCASECMP
-#define HAVE_STRNCASECMP 0
+#define HAVE_STRNCASECMP 0
#endif
#ifndef HAVE_ISNAN
-#define HAVE_ISNAN 0
+#define HAVE_ISNAN 0
#endif
#ifndef HAVE_ISFINITE
-#define HAVE_ISFINITE 0
+#define HAVE_ISFINITE 0
+#endif
+
+#ifndef HAVE_FINITE
+#define HAVE_FINITE 0
#endif
#ifndef HAVE_SIGNBIT
-#define HAVE_SIGNBIT 0
+#define HAVE_SIGNBIT 0
#endif
#ifndef HAVE_STRTOLL
-#define HAVE_STRTOLL 0
+#define HAVE_STRTOLL 0
#endif
#ifndef HAVE_STRTOF
-#define HAVE_STRTOF 0
+#define HAVE_STRTOF 0
#endif
#ifdef __cplusplus
--
Gitblit v1.9.1