From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Wed, 2 Jul 2008 22:05:32 +0000 (+0000)
Subject: Fix the build
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0227089563a065ae4ee11e67877364f3ce068cdb;p=dana%2Fcg-glib.git

Fix the build

svn path=/trunk/; revision=7151
---

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 13ea0e3d..85ee2be5 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gfilemonitor.c: Fix the build.
+
 2008-07-02  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 536160 – Add g_file_monitor()
diff --git a/gio/gfilemonitor.c b/gio/gfilemonitor.c
index 4e529322..5804dc20 100644
--- a/gio/gfilemonitor.c
+++ b/gio/gfilemonitor.c
@@ -53,6 +53,9 @@ enum {
   LAST_SIGNAL
 };
 
+/* work around a limitation of the aliasing foo */
+#undef g_file_monitor
+
 G_DEFINE_ABSTRACT_TYPE (GFileMonitor, g_file_monitor, G_TYPE_OBJECT);
 
 typedef struct {