Fix gamin/fam difference build issue. (#509419)

2008-01-30  Alexander Larsson  <alexl@redhat.com>

	* fam/fam-helper.c:
	Fix gamin/fam difference build issue. (#509419)

svn path=/trunk/; revision=6422

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 5326389..103f83b 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-30  Alexander Larsson  <alexl@redhat.com>
+
+       * fam/fam-helper.c:
+       Fix gamin/fam difference build issue. (#509419)
+
 2008-01-29  Alexander Larsson  <alexl@redhat.com>
 
         * gappinfo.h:

diff --git a/gio/fam/fam-helper.c b/gio/fam/fam-helper.c
index 98927cb..c6b2c5f 100644 (file)
--- a/gio/fam/fam-helper.c
+++ b/gio/fam/fam-helper.c
@@ -41,8 +41,13 @@ struct _fam_sub
   FAMRequest request;
 };
 
-static GFileMonitorEvent 
-fam_event_to_file_monitor_event (FAMCodes code)
+/* This uses int as the argument type because the
+   real type differs between implementations:
+   gamin has "typedef enum FAMCodes {....} FAMCodes;"
+   fam has "enum FAMCodes { ... }".
+*/
+static GFileMonitorEvent  
+fam_event_to_file_monitor_event (int code)
 {
   switch (code)
     {