X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/657ace25fc9c54a83d3f99f0ee24322e3718089b..467944fe0ac76fb00b1e9b3a919b1ce4a165ef0f:/src/win32/compiler/visualc.h

diff --git a/src/win32/compiler/visualc.h b/src/win32/compiler/visualc.h
index 0ed25e8114..6844375b24 100644
--- a/src/win32/compiler/visualc.h
+++ b/src/win32/compiler/visualc.h
@@ -3,7 +3,8 @@
 
 /* borland.h - simgrid config for Borland C++ Builder   */
 
-/* Copyright (c) 2003, 2004 Cherier Malek. All rights reserved.            */
+/* Copyright (c) 2007, 2008, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -325,41 +326,65 @@ the double. For now, GRAS requires the structures to be compacted. */
 	#undef ADDR2LINE
 #endif
 
-#if !defined(HAVE_VA_COPY)
-	#define HAVE_VA_COPY 1
-#endif
 
-/* This macro is not defined in borland stdarg.h include file, adds it. */
-#define va_copy(dest,src)   ((dest)=(src))  
+#ifndef __VISUALC__
 
-/* Predefined possible va_copy() implementation (id: ASP) */
-#define __VA_COPY_USE_ASP(d, s) do { *(d) = *(s); } while (0)
+	#if !defined(HAVE_VA_COPY)
+		#define HAVE_VA_COPY 1
+	#endif
 
-/* Predefined possible va_copy() implementation (id: ASS) */
-#define __VA_COPY_USE_ASS(d, s) do { (d) = (s); } while (0)
+	/* This macro is not defined in borland stdarg.h include file, adds it. */
+	#ifndef va_copy(dest,src)
+		#define va_copy(dest,src)   ((dest)=(src))
+	#endif
 
-/* Predefined possible va_copy() implementation (id: C99) */
-#define __VA_COPY_USE_C99(d, s) va_copy((d), (s))
+	#ifndef __VA_COPY_USE_ASP(d, s)
+	/* Predefined possible va_copy() implementation (id: ASP) */
+		#define __VA_COPY_USE_ASP(d, s) do { *(d) = *(s); } while (0)
+	#endif
 
-/* Predefined possible va_copy() implementation (id: CPP) */
-#define __VA_COPY_USE_CPP(d, s) memcpy((void *)(d), (void *)(s)), sizeof(*(s))
+	#ifndef __VA_COPY_USE_ASS(d, s)
+	/* Predefined possible va_copy() implementation (id: ASS) */
+		#define __VA_COPY_USE_ASS(d, s) do { (d) = (s); } while (0)
+	#endif
 
-/* Predefined possible va_copy() implementation (id: CPS) */
-#define __VA_COPY_USE_CPS(d, s) memcpy((void *)&(d), (void *)&(s)), sizeof((s))
+	#ifndef __VA_COPY_USE_C99(d, s)
+	/* Predefined possible va_copy() implementation (id: C99) */
+		#define __VA_COPY_USE_C99(d, s) va_copy((d), (s))
+	#endif
 
-/* Predefined possible va_copy() implementation (id: GCB) */
-#define __VA_COPY_USE_GCB(d, s) __builtin_va_copy((d), (s))
+	#ifndef __VA_COPY_USE_CPP(d, s)
+	/* Predefined possible va_copy() implementation (id: CPP) */
+		#define __VA_COPY_USE_CPP(d, s) memcpy((void *)(d), (void *)(s)), sizeof(*(s))
+	#endif
 
-/* Predefined possible va_copy() implementation (id: GCH) */
-#define __VA_COPY_USE_GCH(d, s) __va_copy((d), (s))
+	#ifndef __VA_COPY_USE_CPS(d, s)
+	/* Predefined possible va_copy() implementation (id: CPS) */
+		#define __VA_COPY_USE_CPS(d, s) memcpy((void *)&(d), (void *)&(s)), sizeof((s))
+	#endif
 
-/* Predefined possible va_copy() implementation (id: GCM) */
-#define __VA_COPY_USE_GCM(d, s) VA_COPY((d), (s))
+	#ifndef __VA_COPY_USE_GCB(d, s)
+	/* Predefined possible va_copy() implementation (id: GCB) */
+		#define __VA_COPY_USE_GCB(d, s) __builtin_va_copy((d), (s))
+	#endif
+
+	#ifndef __VA_COPY_USE_GCH(d, s)
+	/* Predefined possible va_copy() implementation (id: GCH) */
+		#define __VA_COPY_USE_GCH(d, s) __va_copy((d), (s))
+	#endif
+	/* Predefined possible va_copy() implementation (id: GCM) */
+	#define __VA_COPY_USE_GCM(d, s) VA_COPY((d), (s))
 
 
-/* Optional va_copy() implementation activation */
-#ifndef HAVE_VA_COPY
-#define va_copy(d, s) __VA_COPY_USE(d, s)
+	/* Optional va_copy() implementation activation */
+	#ifndef HAVE_VA_COPY
+	#define va_copy(d, s) __VA_COPY_USE(d, s)
+	#endif
+
+	/* Define to id of used va_copy() implementation */
+	#ifndef __VA_COPY_USE
+		#define __VA_COPY_USE __VA_COPY_USE_C99
+	#endif
 #endif
 
 /* xbt contexts are based on our threads implementation */
@@ -367,13 +392,12 @@ the double. For now, GRAS requires the structures to be compacted. */
 #define CONTEXT_THREADS 1
 #endif
 
+
 /* xbt contexts are not based on ucontext */
 #ifdef CONTEXT_UCONTEXT
 #undef CONTEXT_UCONTEXT
 #endif
 
-/* Define to id of used va_copy() implementation */
-#define __VA_COPY_USE __VA_COPY_USE_C99
 
 #ifndef _XBT_CALL
 	#if defined(_XBT_DESIGNATED_DLL)