X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f783ed4680c6862a1b7543237e89d1221334bae0..1c76cada7536a194addfbf668f4367f390fe8aed:/include/simgrid_config.h.in

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index 4c1feb7d61..03794ce301 100644
--- 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.    */
@@ -20,9 +18,9 @@ SG_BEGIN_DECL()
 #define MAKE_SIMGRID_VERSION(major, minor, patch)       \
   (100UL * (100UL * (major) + (minor)) + (patch))
 
-#cmakedefine SIMGRID_VERSION_MAJOR @SIMGRID_VERSION_MAJOR@
-#cmakedefine SIMGRID_VERSION_MINOR @SIMGRID_VERSION_MINOR@
-#cmakedefine SIMGRID_VERSION_PATCH @SIMGRID_VERSION_PATCH@
+#define SIMGRID_VERSION_MAJOR @SIMGRID_VERSION_MAJOR@
+#define SIMGRID_VERSION_MINOR @SIMGRID_VERSION_MINOR@
+#define SIMGRID_VERSION_PATCH @SIMGRID_VERSION_PATCH@
 
 #define SIMGRID_VERSION MAKE_SIMGRID_VERSION(SIMGRID_VERSION_MAJOR, \
                                              SIMGRID_VERSION_MINOR, \
@@ -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