Merge pull request #85 from richardbarlow/master

Jan Breuer

2017-04-10 1f3aae322221514a8df3e06c0adf6844a597b025

 libscpi/src/utils_private.h

@@ -88,9 +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, scpi_bool_t rollback) LOCAL;
   scpi_bool_t OUR_get_parts(scpi_error_info_heap_t * heap, const char *s1, size_t * len1, const char ** s2, size_t * len2) 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