X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa2662427da4a4b81ea2e67561a223b9c4c3b4d0..9d85ead7a4eb80631f931e45d894a446c7e73bb6:/buildtools/Cmake/gras_config.h.in

diff --git a/buildtools/Cmake/gras_config.h.in b/buildtools/Cmake/gras_config.h.in
index fccb7011d1..4cdeafdd8e 100644
--- a/buildtools/Cmake/gras_config.h.in
+++ b/buildtools/Cmake/gras_config.h.in
@@ -2,8 +2,21 @@
 // With Cmake it creates <root>/src/gras_config.h
 
 /* Set somes variables for Windows compilation */
-#cmakedefine __STRICT_ANSI__ @__STRICT_ANSI__@
-#cmakedefine _MSC_VER @_MSC_VER@
+#ifndef __STRICT_ANSI__
+	#cmakedefine __STRICT_ANSI__ @__STRICT_ANSI__@
+#endif
+#ifndef _MSC_VER
+	#cmakedefine _MSC_VER @_MSC_VER@
+#endif
+#ifndef _WIN32
+	#cmakedefine _WIN32 @_WIN32@
+#endif
+#ifndef WIN32
+	#cmakedefine WIN32 @WIN32@
+#endif
+#ifdef _WIN32
+	#define __VISUALC__
+#endif
 
 /* Set to true if enable_model-checking is true */
 #cmakedefine MMALLOC_WANT_OVERIDE_LEGACY @MMALLOC_WANT_OVERIDE_LEGACY@
@@ -19,34 +32,37 @@
 #cmakedefine ADDR2LINE "@ADDR2LINE@"
 
 /* Predefined possible va_copy() implementation (id: ASP) */
-#cmakedefine __VA_COPY_USE_ASP @__VA_COPY_USE_ASP@
+#cmakedefine __VA_COPY_USE_ASP(d, s) @__VA_COPY_USE_ASP@
 
 /* Predefined possible va_copy() implementation (id: ASS) */
-#cmakedefine __VA_COPY_USE_ASS @__VA_COPY_USE_ASS@
+#cmakedefine __VA_COPY_USE_ASS(d, s) @__VA_COPY_USE_ASS@
 
 /* Predefined possible va_copy() implementation (id: C99) */
-#cmakedefine __VA_COPY_USE_C99 @__VA_COPY_USE_C99@
+#cmakedefine __VA_COPY_USE_C99(d, s) @__VA_COPY_USE_C99@
 
 /* Define if xbt contexts are based on our threads implementation or not */
 #cmakedefine CONTEXT_THREADS @CONTEXT_THREADS@
 
+/* Define to 1 if you have the <ucontext.h> header file. */
+#cmakedefine HAVE_UCONTEXT_H @HAVE_UCONTEXT_H@
+
 /* Define if xbt contexts are based on ucontext or not */
 #cmakedefine CONTEXT_UCONTEXT @CONTEXT_UCONTEXT@
 
 /* Predefined possible va_copy() implementation (id: CPP) */
-#cmakedefine __VA_COPY_USE_CPP @__VA_COPY_USE_CPP@
+#cmakedefine __VA_COPY_USE_CPP(d, s) @__VA_COPY_USE_CPP@
 
 /* Predefined possible va_copy() implementation (id: CPS) */
-#cmakedefine __VA_COPY_USE_CPS @__VA_COPY_USE_CPS@
+#cmakedefine __VA_COPY_USE_CPS(d, s) @__VA_COPY_USE_CPS@
 
 /* Predefined possible va_copy() implementation (id: GCB) */
-#cmakedefine __VA_COPY_USE_GCB @__VA_COPY_USE_GCB@
+#cmakedefine __VA_COPY_USE_GCB(d, s) @__VA_COPY_USE_GCB@
 
 /* Predefined possible va_copy() implementation (id: GCH) */
-#cmakedefine __VA_COPY_USE_GCH @__VA_COPY_USE_GCH@
+#cmakedefine __VA_COPY_USE_GCH(d, s) @__VA_COPY_USE_GCH@
 
 /* Predefined possible va_copy() implementation (id: GCM) */
-#cmakedefine __VA_COPY_USE_GCM @__VA_COPY_USE_GCM@
+#cmakedefine __VA_COPY_USE_GCM(d, s) @__VA_COPY_USE_GCM@
 
 /* Defined if arrays in struct can straddle struct alignment boundaries. This
    is like than the structure compaction above, but this time, the argument to
@@ -271,12 +287,10 @@
 
 /* Optional va_copy() implementation activation */
 #ifndef HAVE_VA_COPY
-#define va_copy(d, s) __VA_COPY_USE
+#define va_copy(d, s) __VA_COPY_USE(d, s)
 #endif
-
-
 /* Define to id of used va_copy() implementation */
-#cmakedefine __VA_COPY_USE @__VA_COPY_USE@
+#cmakedefine __VA_COPY_USE(d, s) @__VA_COPY_USE@
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #cmakedefine const @const@
@@ -288,4 +302,4 @@
 #endif
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
-#cmakedefine size_t @size_t@
+#cmakedefine size_t @size_t@
\ No newline at end of file