talons

commit 6bebf902d8aa6e230689648d2114f5d743160a3d
parent dfe9acba7d65a26e7b00cc8859b3d75bd698d7ff
Author: Colin Leroy <colin@colino.net>
Date:   Sun,  3 Apr 2011 21:22:46 +0000

2011-04-03 [colin]	3.7.8cvs71

	* src/common/utils.h
		Fix bug #2394, "backtrace() crashes on FreeBSD"
		That's not the first bug-report where internal
		debug-only backtrace() crashes on FreeBSD.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/utils.h
 | 
2
+-

4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-03 [colin]	3.7.8cvs71
+
+	* src/common/utils.h
+		Fix bug #2394, "backtrace() crashes on FreeBSD"
+		That's not the first bug-report where internal
+		debug-only backtrace() crashes on FreeBSD.
+
 2011-04-03 [colin]	3.7.8cvs70
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4144,3 +4144,4 @@
 ( cvs diff -u -r 1.94.2.213 -r 1.94.2.214 src/messageview.c;  ) > 3.7.8cvs68.patchset
 ( cvs diff -u -r 1.29.2.12 -r 1.29.2.13 INSTALL;  ) > 3.7.8cvs69.patchset
 ( cvs diff -u -r 1.382.2.568 -r 1.382.2.569 src/compose.c;  ) > 3.7.8cvs70.patchset
+( cvs diff -u -r 1.20.2.76 -r 1.20.2.77 src/common/utils.h;  ) > 3.7.8cvs71.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=70
+EXTRA_VERSION=71
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/utils.h b/src/common/utils.h
@@ -192,7 +192,7 @@ typedef gint64 goffset;
 #define IS_ASCII(c) (((guchar) c) <= 0177 ? 1 : 0)
 
 /* from NetworkManager */
-#if HAVE_BACKTRACE
+#if (defined(HAVE_BACKTRACE) && !defined(__FreeBSD__))
 #define print_backtrace()						\
 G_STMT_START								\
 {									\