about summary refs log tree commit diff
path: root/src/logging/nm-logging.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-10-28 23:04:21 +0200
committerMichael Biebl <biebl@debian.org>2011-10-28 23:04:21 +0200
commitbc5840a47a748ffc2b6e7ec24c3dc5ba79664ca8 (patch)
treebace204fa423c7489da190c08c2e86242c6b4588 /src/logging/nm-logging.c
parent0ed641587611afffa0b2cd38d5c70bdb480fa241 (diff)
parent485d149fe80915d94ed49ea6c2c0552cf7a3e79a (diff)
Merge commit 'upstream/0.9.1.95'
Diffstat (limited to 'src/logging/nm-logging.c')
-rw-r--r--src/logging/nm-logging.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c
index d8353f27..078f1527 100644
--- a/src/logging/nm-logging.c
+++ b/src/logging/nm-logging.c
@@ -30,10 +30,13 @@
 #include <errno.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <execinfo.h>
 #include <strings.h>
 #include <string.h>
 
+#ifdef ENABLE_CRASHTRACE
+#include <execinfo.h>
+#endif
+
 #include <glib/gi18n.h>
 
 #include "nm-logging.h"
@@ -262,6 +265,7 @@ _nm_log (const char *loc,
 static void
 fallback_get_backtrace (void)
 {
+#ifdef ENABLE_CRASHTRACE
 	void *frames[64];
 	Dl_info info;
 	size_t size;
@@ -289,6 +293,7 @@ fallback_get_backtrace (void)
 		}
 	}
 	syslog (LOG_CRIT, "******************* END **********************************");
+#endif  /* ENABLE_CRASHTRACE */
 }