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.

diff --git a/ChangeLog b/ChangeLog
index 065e44eb6b76ead1005e3ae92ce5cdfb237dddd6..495d75e6e1aa764147d57b611d5a48d7e2ec5f0a 100644 (file)
--- 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
 2011-04-03 [colin]     3.7.8cvs70
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 3dd8e3f44ecc87f923a0dccba7356b81ab29e3e9..3dec7fd295a5b067b06edc102c3466a92cecdff0 100644 (file)
--- 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.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
index 6b502385013dff61b2807e9fbbc1c8d16abc6514..ab4a8b8ce36a7e0386f28f948751f299f9f80e9a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=70
+EXTRA_VERSION=71

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.h b/src/common/utils.h
index 30c7b2632c64fb70f9663c033b05c6ba11d6d27c..b416516b9b3d5caf53ffb0df924a8c1942afc27d 100644 (file)
--- 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 */
 #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                                                           \
 {                                                                      \
 #define print_backtrace()                                              \
 G_STMT_START                                                           \
 {                                                                      \