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

diff --git a/main/hashtab.c b/main/hashtab.c
index 4b765979f32768fdbc4c9baaf8a7ea272cc8f77f..d6cd7aa6d2936a423c2475a59d5337e35b2f0184 100644 (file)
--- 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 60071952d3d378f7c2ebae183e897f20d5d43306..1f05285560a9a7680765b0c15ff4c33f95cb2c8a 100644 (file)
--- 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)