2011-10-31 [colin] 3.7.10cvs65

	* src/common/defs.h
		Fix build with GLib 2.31. Thanks to Charles A. Edwards

diff --git a/ChangeLog b/ChangeLog
index 6da1730a6d77fa6fed686b4a799e5a01840f20e9..dab38cd3b81da75df781f8b0939fe8b0b69ffe4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-31 [colin]     3.7.10cvs65
+
+       * src/common/defs.h
+               Fix build with GLib 2.31. Thanks to Charles A. Edwards
+
 2011-10-31 [pawel]     3.7.10cvs64
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index bfc3ebcde9e828f119c81733c98b1865277f7f80..28a9dd829685b4a4df0524b62f08c9c7e503ce5b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4268,3 +4268,4 @@
 ( cvs diff -u -r 1.382.2.590 -r 1.382.2.591 src/compose.c;  ) > 3.7.10cvs62.patchset
 ( cvs diff -u -r 1.12.2.78 -r 1.12.2.79 src/prefs_template.c;  ) > 3.7.10cvs63.patchset
 ( cvs diff -u -r 1.395.2.434 -r 1.395.2.435 src/summaryview.c;  cvs diff -u -r 1.5.2.100 -r 1.5.2.101 src/gtk/gtkutils.c;  ) > 3.7.10cvs64.patchset
+( cvs diff -u -r 1.9.2.52 -r 1.9.2.53 src/common/defs.h;  ) > 3.7.10cvs65.patchset

diff --git a/configure.ac b/configure.ac
index 862415f7d0c4edbf12fc343b6d8077904262dca1..3f47e129714a8d798f13c7c4492808dc17f14b83 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=64
+EXTRA_VERSION=65
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/defs.h b/src/common/defs.h
index 20910c2202b3276c1a825fc58b9476e5b02c52a0..ae7d4d7e81975a69f1a27d1ad7dbd6cffbb3204a 100644 (file)
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -24,7 +24,7 @@
 #  include "config.h"
 #endif
 
-#include <glibconfig.h>
+#include <glib.h>
 
 #ifdef G_OS_WIN32
 #  include <glib/gwin32.h>