From 15671f57ea852bc1df5c0d2a358b714eeb097074 Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周一, 17 10月 2016 14:27:19 +0800 Subject: [PATCH] Merge pull request #83 from ardovm/master --- libscpi/src/utils_private.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libscpi/src/utils_private.h b/libscpi/src/utils_private.h index 68b52bc..f83c6d4 100644 --- a/libscpi/src/utils_private.h +++ b/libscpi/src/utils_private.h @@ -88,10 +88,14 @@ #endif #if USE_DEVICE_DEPENDENT_ERROR_INFORMATION && !USE_MEMORY_ALLOCATION_FREE - char * OUR_strdup(scpi_error_info_heap_t * heap, const char *s) LOCAL; - void OUR_free(scpi_error_info_heap_t * heap, const char *s) LOCAL; - char * OUR_get_1st_part(const char *s, size_t * len) LOCAL; - char * OUR_get_2nd_part(const char *s, size_t * len) LOCAL; + void scpiheap_init(scpi_error_info_heap_t * heap, char * error_info_heap, size_t error_info_heap_length); + char * scpiheap_strndup(scpi_error_info_heap_t * heap, const char *s, size_t n) LOCAL; + void scpiheap_free(scpi_error_info_heap_t * heap, char *s, scpi_bool_t rollback) LOCAL; + scpi_bool_t scpiheap_get_parts(scpi_error_info_heap_t * heap, const char *s1, size_t * len1, const char ** s2, size_t * len2) LOCAL; +#endif + +#if !HAVE_STRNDUP + char *OUR_strndup(const char *s, size_t n); #endif #ifndef min -- Gitblit v1.9.1