[asterisk-commits] rmudgett: trunk r396850 - in /trunk/main: hashtab.c utils.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Aug 16 11:26:11 2013
New Revision: 396850

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=396850
Log:
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.

Modified:
    trunk/main/hashtab.c
    trunk/main/utils.c

Modified: trunk/main/hashtab.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/hashtab.c?view=diff&rev=396850&r1=396849&r2=396850
==============================================================================
--- trunk/main/hashtab.c (original)
+++ trunk/main/hashtab.c Fri Aug 16 11:26:11 2013
@@ -42,6 +42,10 @@
 #include "asterisk/linkedlists.h"
 #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);

Modified: trunk/main/utils.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/utils.c?view=diff&rev=396850&r1=396849&r2=396850
==============================================================================
--- trunk/main/utils.c (original)
+++ trunk/main/utils.c Fri Aug 16 11:26:11 2013
@@ -73,10 +73,6 @@
 
 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);