2008-05-24 [colin] 3.4.0cvs68

	* src/common/utils.h
		Fix wrong define on old glibs

diff --git a/ChangeLog b/ChangeLog
index efd46ebb85a57a5abb1ceaee9b7e7bc83958582b..efc5b331b28387f226149427b729787cb892dbf7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-24 [colin]     3.4.0cvs68
+
+       * src/common/utils.h
+               Fix wrong define on old glibs
+
 2008-05-24 [paul]      3.4.0cvs67
 
        * src/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 84800019d48d3fde70a456a9b84323434b764f64..3cfe1f99a2b5410267b49d4897918e5dbcec6271 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3363,3 +3363,4 @@
 ( cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/common/md5.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/md5.h;  ) > 3.4.0cvs65.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/pixmaps/insert_file.xpm;  ) > 3.4.0cvs66.patchset
 ( cvs diff -u -r 1.155.2.86 -r 1.155.2.87 src/Makefile.am;  cvs diff -u -r 1.25.2.56 -r 1.25.2.57 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.35 -r 1.18.2.36 src/stock_pixmap.h;  cvs diff -u -r 1.43.2.100 -r 1.43.2.101 src/toolbar.c;  diff -u /dev/null src/pixmaps/cancel.xpm;  cvs diff -u -r 1.1.14.2 -r 1.1.14.3 src/pixmaps/close.xpm;  ) > 3.4.0cvs67.patchset
+( cvs diff -u -r 1.20.2.61 -r 1.20.2.62 src/common/utils.h;  ) > 3.4.0cvs68.patchset

diff --git a/configure.ac b/configure.ac
index 51e53a294520df58440dc018777a445f9f4c0336..7f81bba202a3d5c59155c0a8e580aaaccd12acc2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=67
+EXTRA_VERSION=68
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.h b/src/common/utils.h
index 6754c7b2959f55268d1b75b55b96b71124880c9c..915da6b74c2fecb813dc05dc811d23298ba1aad9 100644 (file)
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -50,7 +50,7 @@
 #define g_mkdir                mkdir
 #define g_stat         stat
 #define g_lstat                lstat
-#define claws_unlink   unlink
+#define g_unlink       unlink
 #define g_remove       remove
 #define g_rmdir                rmdir
 #define g_fopen                fopen