From c7d5f90ba982bc3dba3aa356c70ba5ac8863d699 Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周日, 24 4月 2016 20:20:50 +0800 Subject: [PATCH] Fix OUR_strndup, optimize non USE_DEVICE_DEPENDENT_ERROR_INFORMATION configuration --- libscpi/inc/scpi/config.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libscpi/inc/scpi/config.h b/libscpi/inc/scpi/config.h index ee07954..712b706 100644 --- a/libscpi/inc/scpi/config.h +++ b/libscpi/inc/scpi/config.h @@ -271,14 +271,14 @@ #define SCPIDEFINE_free(h, s, r) free((s)) #else #define SCPIDEFINE_DESCRIPTION_MAX_PARTS 3 -#define SCPIDEFINE_strndup(h, s, l) OUR_strndup((h), (s), (l)) -#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)) +#define SCPIDEFINE_strndup(h, s, l) scpiheap_strndup((h), (s), (l)) +#define SCPIDEFINE_free(h, s, r) scpiheap_free((h), (s), (r)) +#define SCPIDEFINE_get_parts(h, s, l1, s2, l2) scpiheap_get_parts((h), (s), (l1), (s2), (l2)) #endif #else #define SCPIDEFINE_DESCRIPTION_MAX_PARTS 1 #define SCPIDEFINE_strdup(h, s, l) NULL -#define SCPIDEFINE_free(h, s, r) (void) +#define SCPIDEFINE_free(h, s, r) #endif #ifdef __cplusplus -- Gitblit v1.9.1