Merge branch 'MC_LTL'

[simgrid.git] / include / simgrid_config.h.in

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index 3e54b0b..03794ce 100644 (file)
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* simgrid_config.h - Results of the configure made visible to user code    */
 
 /* Copyright (c) 2009, 2010, 2011. Da SimGrid team. All rights reserved.    */
@@ -31,12 +29,18 @@ SG_BEGIN_DECL()
 /* take care of DLL usage madness */
 
 #ifdef _XBT_DLL_EXPORT
-       #define DLL_EXPORT
+       #ifndef DLL_EXPORT
+               #define DLL_EXPORT
+       #endif
 #else
        #ifdef _XBT_DLL_STATIC
-               #define DLL_STATIC
+               #ifndef DLL_STATIC
+                       #define DLL_STATIC
+               #endif
        #else
-               #define DLL_IMPORT
+               #ifndef DLL_EXPORT
+                       #define DLL_IMPORT
+               #endif
        #endif
 #endif