From a5b6afb1b12e7ed64353c680e0caa4fb58a9ee1d Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周日, 24 4月 2016 16:29:55 +0800 Subject: [PATCH] Just code formatting --- libscpi/inc/scpi/config.h | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/libscpi/inc/scpi/config.h b/libscpi/inc/scpi/config.h index ea19d8e..94bf67d 100644 --- a/libscpi/inc/scpi/config.h +++ b/libscpi/inc/scpi/config.h @@ -90,10 +90,10 @@ #endif #ifndef USE_DEVICE_DEPENDENT_ERROR_INFORMATION -#define USE_DEVICE_DEPENDENT_ERROR_INFORMATION 1 - #ifndef USE_MEMORY_ALLOCATION_FREE - #define USE_MEMORY_ALLOCATION_FREE 1 - #endif +#define USE_DEVICE_DEPENDENT_ERROR_INFORMATION 0 +#ifndef USE_MEMORY_ALLOCATION_FREE +#define USE_MEMORY_ALLOCATION_FREE 1 +#endif #endif @@ -199,8 +199,10 @@ /* PIC32mx */ #if defined(__C32__) #define HAVE_STRNLEN 0 -#define HAVE_STRNCASECMP 1 +#define HAVE_STRNCASECMP 0 #define HAVE_STRNICMP 0 +#define isfinite finite +#define signbit(x) ((x)<0) #endif /* AVR libc */ @@ -259,23 +261,23 @@ #endif #if USE_DEVICE_DEPENDENT_ERROR_INFORMATION - #if USE_MEMORY_ALLOCATION_FREE - #include <stdlib.h> - #include <string.h> - #include <malloc.h> - #define SCPIDEFINE_DESCRIPTION_MAX_PARTS 2 - #define SCPIDEFINE_strdup(h, s) strdup((s)) - #define SCPIDEFINE_free(h, s, r) free((s)) - #else - #define SCPIDEFINE_DESCRIPTION_MAX_PARTS 3 - #define SCPIDEFINE_strdup(h, s) OUR_strdup((h), (s)) - #define SCPIDEFINE_free(h, s, r) OUR_free((h), (s), (r)) - #define SCPIDEFINE_get_parts(h, s, l1, s2, l2) OUR_get_parts((h), (s), (l1), (s2), (l2)) - #endif + +#if USE_MEMORY_ALLOCATION_FREE +#include <stdlib.h> +#include <string.h> +#define SCPIDEFINE_DESCRIPTION_MAX_PARTS 2 +#define SCPIDEFINE_strdup(h, s) strdup((s)) +#define SCPIDEFINE_free(h, s, r) free((s)) #else - #define SCPIDEFINE_DESCRIPTION_MAX_PARTS 1 - #define SCPIDEFINE_strdup(h, s) NULL - #define SCPIDEFINE_free(h, s, r) (void) +#define SCPIDEFINE_DESCRIPTION_MAX_PARTS 3 +#define SCPIDEFINE_strdup(h, s) OUR_strdup((h), (s)) +#define SCPIDEFINE_free(h, s, r) OUR_free((h), (s), (r)) +#define SCPIDEFINE_get_parts(h, s, l1, s2, l2) OUR_get_parts((h), (s), (l1), (s2), (l2)) +#endif +#else +#define SCPIDEFINE_DESCRIPTION_MAX_PARTS 1 +#define SCPIDEFINE_strdup(h, s) NULL +#define SCPIDEFINE_free(h, s, r) (void) #endif #ifdef __cplusplus -- Gitblit v1.9.1