jansson_private.h (jansson-2.13.1.tar.bz2) | : | jansson_private.h (jansson-2.14.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 94 | skipping to change at line 94 | |||
/* Wrappers for custom memory functions */ | /* Wrappers for custom memory functions */ | |||
void *jsonp_malloc(size_t size) JANSSON_ATTRS((warn_unused_result)); | void *jsonp_malloc(size_t size) JANSSON_ATTRS((warn_unused_result)); | |||
void jsonp_free(void *ptr); | void jsonp_free(void *ptr); | |||
char *jsonp_strndup(const char *str, size_t length) JANSSON_ATTRS((warn_unused_r esult)); | char *jsonp_strndup(const char *str, size_t length) JANSSON_ATTRS((warn_unused_r esult)); | |||
char *jsonp_strdup(const char *str) JANSSON_ATTRS((warn_unused_result)); | char *jsonp_strdup(const char *str) JANSSON_ATTRS((warn_unused_result)); | |||
char *jsonp_strndup(const char *str, size_t len) JANSSON_ATTRS((warn_unused_resu lt)); | char *jsonp_strndup(const char *str, size_t len) JANSSON_ATTRS((warn_unused_resu lt)); | |||
/* Circular reference check*/ | /* Circular reference check*/ | |||
/* Space for "0x", double the sizeof a pointer for the hex and a terminator. */ | /* Space for "0x", double the sizeof a pointer for the hex and a terminator. */ | |||
#define LOOP_KEY_LEN (2 + (sizeof(json_t *) * 2) + 1) | #define LOOP_KEY_LEN (2 + (sizeof(json_t *) * 2) + 1) | |||
int jsonp_loop_check(hashtable_t *parents, const json_t *json, char *key, | int jsonp_loop_check(hashtable_t *parents, const json_t *json, char *key, size_t | |||
size_t key_size); | key_size, | |||
size_t *key_len_out); | ||||
/* Windows compatibility */ | /* Windows compatibility */ | |||
#if defined(_WIN32) || defined(WIN32) | #if defined(_WIN32) || defined(WIN32) | |||
#if defined(_MSC_VER) /* MS compiller */ | #if defined(_MSC_VER) /* MS compiller */ | |||
#if (_MSC_VER < 1900) && \ | #if (_MSC_VER < 1900) && \ | |||
!defined(snprintf) /* snprintf not defined yet & not introduced */ | !defined(snprintf) /* snprintf not defined yet & not introduced */ | |||
#define snprintf _snprintf | #define snprintf _snprintf | |||
#endif | #endif | |||
#if (_MSC_VER < 1500) && \ | #if (_MSC_VER < 1500) && \ | |||
!defined(vsnprintf) /* vsnprintf not defined yet & not introduced */ | !defined(vsnprintf) /* vsnprintf not defined yet & not introduced */ | |||
End of changes. 1 change blocks. | ||||
2 lines changed or deleted | 3 lines changed or added |