From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 14 Mar 2008 09:45:44 +0000 (+0000)
Subject: Fix up FEN ifdefs
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=9555a3a2cacaedd3bd27c660729d42903a784853;p=dana%2Fcg-glib.git

Fix up FEN ifdefs

2008-03-14  Alexander Larsson  <alexl@redhat.com>

        * giomodule.c:
        (_g_io_modules_ensure_loaded):
	Fix up FEN ifdefs


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

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 49229075..721210d4 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-14  Alexander Larsson  <alexl@redhat.com>
+
+        * giomodule.c:
+        (_g_io_modules_ensure_loaded):
+	Fix up FEN ifdefs
+
 2008-03-14  Alexander Larsson  <alexl@redhat.com>
 
         * glocalfile.c:
diff --git a/gio/giomodule.c b/gio/giomodule.c
index 85fdd6cd..69210e40 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -333,10 +333,14 @@ _g_io_modules_ensure_loaded (void)
 #if defined(HAVE_SYS_INOTIFY_H) || defined(HAVE_LINUX_INOTIFY_H)
       _g_inotify_directory_monitor_get_type ();
       _g_inotify_file_monitor_get_type ();
-#elif defined(HAVE_FEN)
+#endif
+#if defined(HAVE_FEN)
       _g_fen_directory_monitor_get_type ();
       _g_fen_file_monitor_get_type ();
 #endif
+#ifdef G_OS_WIN32
+      g_win32_directory_monitor_get_type ();
+#endif
 #ifdef G_OS_UNIX
       _g_unix_volume_monitor_get_type ();
 #endif