From 0227089563a065ae4ee11e67877364f3ce068cdb Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Wed, 2 Jul 2008 22:05:32 +0000
Subject: Fix the build

svn path=/trunk/; revision=7151
---
 gio/ChangeLog      | 4 ++++
 gio/gfilemonitor.c | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'gio')

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 13ea0e3dd..85ee2be52 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 4e5293220..5804dc20f 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 {
-- 
cgit v1.2.3