From 2b06ed4e2d44aacf761e13c3db3fc1bdf9181c3a Mon Sep 17 00:00:00 2001 From: mom040267 Date: Sat, 11 Oct 2014 06:57:55 +0000 Subject: [PATCH] minor fix --- src/apps/common/ns_turn_utils.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/apps/common/ns_turn_utils.c b/src/apps/common/ns_turn_utils.c index 4388ff5..4406d00 100644 --- a/src/apps/common/ns_turn_utils.c +++ b/src/apps/common/ns_turn_utils.c @@ -755,7 +755,7 @@ static void tm_id(char *id, const char* file, int line) { #define TM_START() char id[128];tm_id(id,file,line);tm_init() -void tm_print_func(void); +extern "C" void tm_print_func(void); void tm_print_func(void) { pthread_mutex_lock(&tm); printf("=============================================\n"); @@ -767,7 +767,7 @@ void tm_print_func(void) { pthread_mutex_unlock(&tm); } -void *turn_malloc_func(size_t sz, const char* file, int line); +extern "C" void *turn_malloc_func(size_t sz, const char* file, int line); void *turn_malloc_func(size_t sz, const char* file, int line) { TM_START(); @@ -779,7 +779,7 @@ void *turn_malloc_func(size_t sz, const char* file, int line) { return ptr; } -void *turn_realloc_func(void *ptr, size_t old_sz, size_t new_sz, const char* file, int line); +extern "C" void *turn_realloc_func(void *ptr, size_t old_sz, size_t new_sz, const char* file, int line); void *turn_realloc_func(void *ptr, size_t old_sz, size_t new_sz, const char* file, int line) { UNUSED_ARG(old_sz); @@ -796,7 +796,7 @@ void *turn_realloc_func(void *ptr, size_t old_sz, size_t new_sz, const char* fil return ptr; } -void turn_free_func(void *ptr, size_t sz, const char* file, int line); +extern "C" void turn_free_func(void *ptr, size_t sz, const char* file, int line); void turn_free_func(void *ptr, size_t sz, const char* file, int line) { UNUSED_ARG(sz); @@ -808,7 +808,7 @@ void turn_free_func(void *ptr, size_t sz, const char* file, int line) { free(ptr); } -void turn_free_simple(void *ptr); +extern "C" void turn_free_simple(void *ptr); void turn_free_simple(void *ptr) { tm_init(); @@ -818,7 +818,7 @@ void turn_free_simple(void *ptr) { free(ptr); } -void *turn_calloc_func(size_t number, size_t size, const char* file, int line); +extern "C" void *turn_calloc_func(size_t number, size_t size, const char* file, int line); void *turn_calloc_func(size_t number, size_t size, const char* file, int line) { TM_START(); @@ -830,7 +830,7 @@ void *turn_calloc_func(size_t number, size_t size, const char* file, int line) { return ptr; } -char *turn_strdup_func(const char* s, const char* file, int line); +extern "C" char *turn_strdup_func(const char* s, const char* file, int line); char *turn_strdup_func(const char* s, const char* file, int line) { TM_START();