[svn-commits] tilghman: trunk r59079 - in /trunk: ./ main/logger.c

[svn-commits at lists.digium.com]

Author: tilghman
Date: Tue Mar 20 16:06:11 2007
New Revision: 59079

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59079
Log:
Merged revisions 59078 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59078 | tilghman | 2007-03-20 16:04:52 -0500 (Tue, 20 Mar 2007) | 2 lines

Fix defines for inline stack backtraces (only used by developers anyway)

........

Modified:
    trunk/   (props changed)
    trunk/main/logger.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/logger.c
URL: http://svn.digium.com/view/asterisk/trunk/main/logger.c?view=diff&rev=59079&r1=59078&r2=59079
==============================================================================
--- trunk/main/logger.c (original)
+++ trunk/main/logger.c Tue Mar 20 16:06:11 2007
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/stat.h>
-#ifdef STACK_BACKTRACES
+#if ((defined(AST_DEVMODE)) && (defined(Linux)))
 #include <execinfo.h>
 #define MAX_BACKTRACE_FRAMES 20
 #endif
@@ -956,7 +956,8 @@
 
 void ast_backtrace(void)
 {
-#ifdef STACK_BACKTRACES
+#ifdef Linux
+#ifdef AST_DEVMODE
 	int count=0, i=0;
 	void **addresses;
 	char **strings;
@@ -978,11 +979,10 @@
 		free(addresses);
 	}
 #else
-#ifdef Linux
-	ast_log(LOG_WARNING, "Must compile with 'make dont-optimize' for stack backtraces\n");
-#else
+	ast_log(LOG_WARNING, "Must run configure with '--enable-dev-mode' for stack backtraces.\n");
+#endif
+#else /* ndef Linux */
 	ast_log(LOG_WARNING, "Inline stack backtraces are only available on the Linux platform.\n");
-#endif
 #endif
 }