summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2011-10-13 13:20:27 +0200
committerMurray Cumming <murrayc@murrayc.com>2011-11-18 12:39:35 +0100
commit28f8fc9278b0a5a8ab7640b2854bbc99010a4bc9 (patch)
treee6a6ddec7fdcada7f6a07f090b668509f3521c01
parentfc0363b1f64005406d998876b54c2bdadd266ea1 (diff)
downloadglibmm-28f8fc9278b0a5a8ab7640b2854bbc99010a4bc9.tar.gz
Do not include glib/gvarianttype.h.
* glib/src/thread.hg: Include glib.h instead. The recent glib version has a pragma that complains about this.
-rw-r--r--ChangeLog7
-rw-r--r--glib/src/varianttype.ccg2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f1c11e4c..7e9cb52e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-13 Murray Cumming <murrayc@murrayc.com>
+
+ Do not include glib/gvarianttype.h.
+
+ * glib/src/thread.hg: Include glib.h instead. The recent glib version
+ has a pragma that complains about this.
+
2011-11-18 Murray Cumming <murrayc@murrayc.com>
Require glibmm 2.2.10 so that make check works.
diff --git a/glib/src/varianttype.ccg b/glib/src/varianttype.ccg
index 6b645307..62a46a79 100644
--- a/glib/src/varianttype.ccg
+++ b/glib/src/varianttype.ccg
@@ -17,7 +17,7 @@
#include <glibmm/varianttype.h>
#include <glibmm/utility.h>
-#include <glib/gvarianttype.h>
+#include <glib.h>
namespace Glib
{