[cig-commits] r5228 - in long/3D/Gale/trunk: . src/StGermain/Base/Extensibility/src

[walter at geodynamics.org]

Author: walter
Date: 2006-11-09 16:48:49 -0800 (Thu, 09 Nov 2006)
New Revision: 5228

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginLoader.h
   long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c
Log:
 r1051 at earth:  boo | 2006-11-09 16:41:45 -0800
 Make shared library builds work



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1050
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1051

Modified: long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginLoader.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginLoader.h	2006-11-10 00:48:46 UTC (rev 5227)
+++ long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginLoader.h	2006-11-10 00:48:49 UTC (rev 5228)
@@ -55,14 +55,13 @@
 	extern const char* PLUGIN_DEPENDENCY_VERSION_KEY;
 	extern const char* PLUGIN_DEPENDENCY_URL_KEY;
 
-#ifdef NOSHARED
         typedef struct {
           PluginLoader_Register_Func*     reg;
           PluginLoader_GetMetadata_Func*  gmd;
           PluginLoader_GetName_Func*      name;
           PluginLoader_GetVersion_Func*   ver;
         } StaticPluginEntry;
-#endif
+
 	/* PluginLoaders info */
 	#define __PluginLoader \
 		/* General info */ \

Modified: long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c	2006-11-10 00:48:46 UTC (rev 5227)
+++ long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c	2006-11-10 00:48:49 UTC (rev 5228)
@@ -44,7 +44,7 @@
 #include <assert.h>
 #include <string.h>
 
-#if NOSHARED
+#ifdef NOSHARED
         #define dlopen( x, y ) (NULL)
 	#define dlsym( x, y ) (NULL)
         #define dlclose( x )