use extern keyword when you link with the static library on Windows

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5930 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 44a3b79..cfa461e 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -131,14 +131,14 @@
 
 /* Pack everything up statically */
 #elif defined(DLL_STATIC)
 
 /* Pack everything up statically */
 #elif defined(DLL_STATIC)

-#  define XBT_PUBLIC(type)            type
+#  define XBT_PUBLIC(type)           extern type

 #  define XBT_EXPORT_NO_IMPORT(type)  type
 #  define XBT_IMPORT_NO_EXPORT(type)  type
 #  define XBT_EXPORT_NO_IMPORT(type)  type
 #  define XBT_IMPORT_NO_EXPORT(type)  type

-#  define XBT_PUBLIC_DATA(type)       type
+#  define XBT_PUBLIC_DATA(type)       extern type

      
 
 /* Link against the DLL */
      
 
 /* Link against the DLL */

-#elif (defined(_WIN32) && !defined(DLL_EXPORT))
+#elif (defined(_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC))

 #  define XBT_PUBLIC(type)             __declspec(dllimport) type
 #  define XBT_EXPORT_NO_IMPORT(type)   type
 #  define XBT_IMPORT_NO_EXPORT(type)   __declspec(dllimport) type
 #  define XBT_PUBLIC(type)             __declspec(dllimport) type
 #  define XBT_EXPORT_NO_IMPORT(type)   type
 #  define XBT_IMPORT_NO_EXPORT(type)   __declspec(dllimport) type