redefinition of the macro XBT_PUBLIC_DATA

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

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 5f0cd7b..2a8e02e 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -115,28 +115,29 @@
 #  define XBT_PUBLIC(type)            __declspec(dllexport) type
 #  define XBT_EXPORT_NO_IMPORT(type)  __declspec(dllexport) type
 #  define XBT_IMPORT_NO_EXPORT(type)  type 
 #  define XBT_PUBLIC(type)            __declspec(dllexport) type
 #  define XBT_EXPORT_NO_IMPORT(type)  __declspec(dllexport) type
 #  define XBT_IMPORT_NO_EXPORT(type)  type 

-#  define XBT_PUBLIC_DATA(type)       type __declspec(dllexport)                               
+#  define XBT_PUBLIC_DATA                       __declspec(dllexport)

 
 /* Pack everything up statically */
 #elif defined(DLL_STATIC)
 #  define XBT_PUBLIC(type)            type
 #  define XBT_EXPORT_NO_IMPORT(type)  type
 #  define XBT_IMPORT_NO_EXPORT(type)  type
 
 /* Pack everything up statically */
 #elif defined(DLL_STATIC)
 #  define XBT_PUBLIC(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                
+     

 
 /* Link against the DLL */
 #elif (defined(_WIN32) && !defined(DLL_EXPORT))
 
 /* Link against the DLL */
 #elif (defined(_WIN32) && !defined(DLL_EXPORT))

-#  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_DATA(type)       type __declspec(dllimport)       
+#  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_DATA                              __declspec(dllimport)           

 
 /* Non-UNIX build. Let's keep sain here ;) */
 #else
 #  define XBT_PUBLIC(type)            extern type
 #  define XBT_EXPORT_NO_IMPORT(type)  type
 #  define XBT_IMPORT_NO_EXPORT(type)  type
 
 /* Non-UNIX build. Let's keep sain here ;) */
 #else
 #  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)       extern type
+#  define XBT_PUBLIC_DATA       

 #endif
    
 
 #endif