Author: gonzalo
Date: 2005-12-08 15:55:45 -0500 (Thu, 08 Dec 2005)
New Revision: 54124
Modified:
branches/mono-1-1-10/mono/mono/metadata/ChangeLog
branches/mono-1-1-10/mono/mono/metadata/filewatcher.c
Log:
from head
Modified: branches/mono-1-1-10/mono/mono/metadata/ChangeLog
===================================================================
--- branches/mono-1-1-10/mono/mono/metadata/ChangeLog 2005-12-08 20:54:16 UTC
(rev 54123)
+++ branches/mono-1-1-10/mono/mono/metadata/ChangeLog 2005-12-08 20:55:45 UTC
(rev 54124)
@@ -1,3 +1,9 @@
+2005-12-01 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * filewatcher.c: try loading libgamin-1.so.0 before libfam, since at
+ least on SUSE 10 they are not the same (on debian, they are just the
+ same thing).
+
2005-11-24 Dick Porter <[EMAIL PROTECTED]>
* process.c
Modified: branches/mono-1-1-10/mono/mono/metadata/filewatcher.c
===================================================================
--- branches/mono-1-1-10/mono/mono/metadata/filewatcher.c 2005-12-08
20:54:16 UTC (rev 54123)
+++ branches/mono-1-1-10/mono/mono/metadata/filewatcher.c 2005-12-08
20:55:45 UTC (rev 54124)
@@ -104,12 +104,20 @@
#else
GModule *fam_module;
gchar *filename;
+ int lib_used = 4; /* gamin */
MONO_ARCH_SAVE_REGS;
- filename = g_module_build_path (NULL, "libfam.so.0");
+ filename = g_module_build_path (NULL, "libgamin-1.so.0");
fam_module = g_module_open (filename, G_MODULE_BIND_LAZY);
g_free (filename);
+ if (fam_module == NULL) {
+ lib_used = 2; /* FAM */
+ filename = g_module_build_path (NULL, "libfam.so.0");
+ fam_module = g_module_open (filename, G_MODULE_BIND_LAZY);
+ g_free (filename);
+ }
+
if (fam_module == NULL)
return 0;
@@ -117,7 +125,7 @@
if (FAMNextEvent == NULL)
return 0;
- return 2;
+ return lib_used;
#endif
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
