[xine-cvs] CVS: xine-lib/src/xine-engine load_plugins.c,1.186,1.187

[Andre P. <at...@us...>]

Update of /cvsroot/xine/xine-lib/src/xine-engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8710

Modified Files:
	load_plugins.c 
Log Message:
Load plugins with ".xineplugin" in its file name on Mac OS X, and also fix up a few minor compiler warnings



Index: load_plugins.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/load_plugins.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- load_plugins.c	1 Sep 2004 18:19:50 -0000	1.186
+++ load_plugins.c	24 Oct 2004 00:59:37 -0000	1.187
@@ -497,8 +497,12 @@
 #elif defined(__CYGWIN__) || defined(WIN32)
 	  if(!strstr(str, ".dll"))
 #else
-	  if(!strstr(str, ".so")) 
+	  if(!strstr(str, ".so")
 #endif
+#ifdef HOST_OS_DARWIN
+             && !strcasestr(str, ".xineplugin")
+#endif
+            )
 	    break;
 
 	  plugin_name = str;
@@ -513,7 +517,7 @@
 #endif
 
 	  if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL)) == NULL) {
-	    char *error = dlerror();
+	    const char *error = dlerror();
 	    /* too noisy -- but good to catch unresolved references */
 	    xprintf(this, XINE_VERBOSITY_LOG, 
 		    _("load_plugins: cannot open plugin lib %s:\n%s\n"), str, error);
@@ -598,7 +602,7 @@
 	      }
 	    }
 	    else {
-	      char *error = dlerror();
+	      const char *error = dlerror();
 
 	      xine_log (this, XINE_LOG_PLUGIN,
 			_("load_plugins: can't get plugin info from %s:\n%s\n"), str, error);
@@ -637,7 +641,7 @@
   void *lib;
 
   if((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL)) == NULL) {
-    char *error = dlerror();
+    const char *error = dlerror();
 
     xine_log (this, XINE_LOG_PLUGIN,
 	      _("load_plugins: cannot (stage 2) open plugin lib %s:\n%s\n"), filename, error);