From bf8143c649292042de87c0cef63e6cb3c523388f Mon Sep 17 00:00:00 2001 From: nancy.liao <huihui.liao@greentest.com.cn> Date: 周四, 08 5月 2025 16:40:10 +0800 Subject: [PATCH] 修改了一些警告信息 --- libscpi/inc/scpi/config.h | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/libscpi/inc/scpi/config.h b/libscpi/inc/scpi/config.h index 70e4097..c611fa8 100644 --- a/libscpi/inc/scpi/config.h +++ b/libscpi/inc/scpi/config.h @@ -57,6 +57,10 @@ #define SCPI_LINE_ENDING LINE_ENDING_CRLF #endif +#ifndef USE_CUSTOM_REGISTERS +#define USE_CUSTOM_REGISTERS 0 +#endif + /** * Detect, if it has limited resources or it is running on a full blown operating system. * All values can be overiden by scpi_user_config.h @@ -100,6 +104,10 @@ #ifndef USE_MEMORY_ALLOCATION_FREE #define USE_MEMORY_ALLOCATION_FREE 1 #endif +#else +#ifndef USE_MEMORY_ALLOCATION_FREE +#define USE_MEMORY_ALLOCATION_FREE 0 +#endif #endif #ifndef USE_COMMAND_TAGS @@ -110,8 +118,8 @@ #define USE_DEPRECATED_FUNCTIONS 1 #endif -#ifndef USE_CUSTOM_DTOSTR -#define USE_CUSTOM_DTOSTR 0 +#ifndef USE_CUSTOM_DTOSTRE +#define USE_CUSTOM_DTOSTRE 0 #endif #ifndef USE_UNITS_IMPERIAL @@ -256,8 +264,10 @@ #else #define SCPIDEFINE_strtoll(n, p, b) strtoll((n), (p), (b)) #define SCPIDEFINE_strtoull(n, p, b) strtoull((n), (p), (b)) - extern long long int strtoll(const char *nptr, char **endptr, int base); - extern unsigned long long int strtoull(const char *nptr, char **endptr, int base); + //杩欓噷娉ㄩ噴鏄负浜嗘秷闄よ鍛� + //extern long long int strtoll(const char *nptr, char **endptr, int base); + //extern unsigned long long int strtoull(const char *nptr, char **endptr, int base); + /* TODO: implement OUR_strtoll and OUR_strtoull */ /* #warning "64bit string to int conversion not implemented" */ #endif -- Gitblit v1.9.1