diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-08-16 16:26:11 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-08-16 16:26:11 +0000 |
commit | a847e65b2ce17e50814d34480e24679ecf4e9f5b (patch) | |
tree | d5db1668a36f69b7655d88580fa41d7872cce190 | |
parent | 745df0fb81c32a1dbec0c6ec8565f7f426658d39 (diff) |
Fix utilities compilation/linking.
The horrid structure of the source in the utils directory strikes again.
Moved the _ast_mem_backtrace_buffer[] definition from the logical location
in utils.c to hashtab.c so the aelparse and conf2ael utilities can link.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | main/hashtab.c | 4 | ||||
-rw-r--r-- | main/utils.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/main/hashtab.c b/main/hashtab.c index 4b765979f..d6cd7aa6d 100644 --- a/main/hashtab.c +++ b/main/hashtab.c @@ -43,6 +43,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/hashtab.h" +#ifndef __AST_DEBUG_MALLOC +void *_ast_mem_backtrace_buffer[_AST_MEM_BACKTRACE_BUFLEN]; +#endif + #if (defined(MALLOC_DEBUG) && !defined(STANDALONE)) static void _ast_hashtab_resize(struct ast_hashtab *tab, const char *file, int lineno, const char *func); #define ast_hashtab_resize(a) _ast_hashtab_resize(a,__FILE__, __LINE__, __PRETTY_FUNCTION__) diff --git a/main/utils.c b/main/utils.c index 60071952d..1f0528556 100644 --- a/main/utils.c +++ b/main/utils.c @@ -74,10 +74,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static char base64[64]; static char b2a[256]; -#ifndef __AST_DEBUG_MALLOC -void *_ast_mem_backtrace_buffer[_AST_MEM_BACKTRACE_BUFLEN]; -#endif - AST_THREADSTORAGE(inet_ntoa_buf); #if !defined(HAVE_GETHOSTBYNAME_R_5) && !defined(HAVE_GETHOSTBYNAME_R_6) |