glib r7151 - trunk/gio

[matthiasc svn gnome org]

Author: matthiasc
Date: Wed Jul  2 22:05:32 2008
New Revision: 7151
URL: http://svn.gnome.org/viewvc/glib?rev=7151&view=rev

Log:
Fix the build


Modified:
   trunk/gio/ChangeLog
   trunk/gio/gfilemonitor.c

Modified: trunk/gio/gfilemonitor.c
==============================================================================
--- trunk/gio/gfilemonitor.c	(original)
+++ trunk/gio/gfilemonitor.c	Wed Jul  2 22:05:32 2008
@@ -53,6 +53,9 @@
   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 {