Fix the build

svn path=/trunk/; revision=7151

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 13ea0e3ddbcc1ffc57537168e19d9ee295b2f430..85ee2be523d927c970b3d544186f0a0f9f89ab26 100644 (file)
--- 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 4e52932200d1abf5da0d86dbbaa323a469c3e216..5804dc20fe2749f1ce1cccff6afe93b0f0909258 100644 (file)
--- 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 {