summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalev Lember <kalev@smartlink.ee>2011-05-02 13:28:02 +0300
committerMurray Cumming <murrayc@murrayc.com>2011-05-02 13:04:59 +0200
commitce458b8884c3ed5f745769385ea33c3a879627b8 (patch)
treee498144637aefcbbaeb95c1032f4a55a075fcf67
parent8335682f484c407a67efbe790f690f9ea0639a78 (diff)
downloadglibmm-ce458b8884c3ed5f745769385ea33c3a879627b8.tar.gz
Gio::DBus::Message: Fixed includes for WIN32
* gio/src/dbusmessage.hg: Added G_OS_UNIX guards around unixfdlist.h include. Bug #649168
-rw-r--r--ChangeLog7
-rw-r--r--gio/src/dbusmessage.hg4
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 75d5558e..872345b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-02 Kalev Lember <kalev@smartlink.ee>
+
+ Gio::DBus::Message: Fixed includes for WIN32
+
+ * gio/src/dbusmessage.hg: Added G_OS_UNIX guards around unixfdlist.h
+ include. Bug #649168
+
2011-04-26 Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
gmmproc: GtkDefs::split_tokens() uses split() instead of substr().
diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg
index fe6c8cc8..b6925628 100644
--- a/gio/src/dbusmessage.hg
+++ b/gio/src/dbusmessage.hg
@@ -20,7 +20,9 @@
#include <glibmm/object.h>
#include <glibmm/variant.h>
#include <glibmm/utility.h>
-#include <giomm/unixfdlist.h>
+#ifdef G_OS_UNIX
+# include <giomm/unixfdlist.h>
+#endif
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/object_p.h)