2008-01-16 [colin] 3.2.0cvs46

	* src/common/passcrypt.c
		Fix build on FreeBSD, thanks to Pawel

diff --git a/ChangeLog b/ChangeLog
index 575b3d1e327c3837035552609556bb60742f052f..3e5d3744d4ce56cd59481cb8573d8e02d2ea735e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-16 [colin]     3.2.0cvs46
+
+       * src/common/passcrypt.c
+               Fix build on FreeBSD, thanks to Pawel
+
 2008-01-15 [colin]     3.2.0cvs45
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 0bee684ddbb98c5306361168b738d61a8c6575d8..27e8dc1bc80104a43091c8e1e9f3fdacd2ed811d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3182,3 +3182,4 @@
 ( cvs diff -u -r 1.382.2.429 -r 1.382.2.430 src/compose.c;  ) > 3.2.0cvs43.patchset
 ( cvs diff -u -r 1.59.2.63 -r 1.59.2.64 src/prefs_filtering.c;  ) > 3.2.0cvs44.patchset
 ( cvs diff -u -r 1.382.2.430 -r 1.382.2.431 src/compose.c;  cvs diff -u -r 1.395.2.350 -r 1.395.2.351 src/summaryview.c;  ) > 3.2.0cvs45.patchset
+( cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/common/passcrypt.c;  ) > 3.2.0cvs46.patchset

diff --git a/configure.ac b/configure.ac
index c43aa593ff6bbd3eec9b6371ff011c8dfd2a9810..5a27d464b40b21aa2eb7666ad2c85bfcfbb8579c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=45
+EXTRA_VERSION=46
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/passcrypt.c b/src/common/passcrypt.c
index 7593667188fe22099d9d7dd6e679091ecb760ab0..432b82edea72439a0c6e9c6363a286e06de81604 100644 (file)
--- a/src/common/passcrypt.c
+++ b/src/common/passcrypt.c
@@ -17,7 +17,11 @@
  * 
  */
 
+#if !defined (__FreeBSD__)
 #define _XOPEN_SOURCE 600
+#else
+#define _XOPEN_SOURCE
+#endif
 
 #include <sys/types.h>
 #include <stdio.h>