X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2a34a8fbc25f9f0b62c16bf59e797c0ad89d2b63..f1142746dbf58e434fc0c27c77bd2ed7bd6c355b:/include/xbt/misc.h

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 44a3b79ba1..cfa461ea58 100644
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -131,14 +131,14 @@
 
 /* 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_PUBLIC_DATA(type)       type
+#  define XBT_PUBLIC_DATA(type)       extern type
      
 
 /* 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