X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b92cf3fa72c82cad5ba0f97d7d30b868f8fc334b..10916c573dcdaebc96b18c90647c1fc5de0e986c:/src/win32/compiler/borland.h

diff --git a/src/win32/compiler/borland.h b/src/win32/compiler/borland.h
index 4b4d140525..2af309bb3b 100644
--- a/src/win32/compiler/borland.h
+++ b/src/win32/compiler/borland.h
@@ -12,7 +12,7 @@
  *  Borland C++ compiler configuration
  */
 
-#include <platform/select_platform_features.h>
+#include <win32/platform/select_platform_features.h>
 
 /* 
  * include files. 
@@ -200,9 +200,16 @@
 #endif
 
 /* "disable the snprintf replacement ( this function is broken on system v only" */
+
+/* FIXEME TO ANALYZE
 #if defined(PREFER_PORTABLE_SNPRINTF)
 	#undef PREFER_PORTABLE_SNPRINTF	
 #endif
+*/
+
+#if !defined(PREFER_PORTABLE_SNPRINTF)
+	#define PREFER_PORTABLE_SNPRINTF	
+#endif
 
 /* The maximal size of any scalar on this arch */
 #if !defined(SIZEOF_MAX)
@@ -336,6 +343,10 @@ the double. For now, GRAS requires the structures to be compacted. */
 #define va_copy(d, s) __VA_COPY_USE(d, s)
 #endif
 
+#ifdef USE_UCONTEXT
+#undef USE_UCONTEXT
+#endif
+
 
 /* Define to id of used va_copy() implementation */
 #define __VA_COPY_USE __VA_COPY_USE_C99
@@ -374,21 +385,6 @@ the double. For now, GRAS requires the structures to be compacted. */
     #endif
 
 
-#if(__BORLANDC__ < 0x540)
-
-	#if (defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) || defined (_XBT_USE_DYNAMIC_LIB) ) && ! defined (_XBT_USE_STATIC_LIB)
-		#undef  _XBT_USE_DECLSPEC
-		#define _XBT_USE_DECLSPEC
-	#endif
-	
-#else
-		
-	#if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) || defined(_AFXDLL) || defined (_XBT_USE_DYNAMIC_LIB) )
-		#undef  _XBT_USE_DECLSPEC
-		#define _XBT_USE_DECLSPEC 1
-	#endif
-#endif
-
 /* For open, read etc. file operations. */
 #include <io.h>
 #include <fcntl.h>
@@ -406,5 +402,9 @@ the double. For now, GRAS requires the structures to be compacted. */
 typedef unsigned int uint32_t;
 typedef int socklen_t;
 
+/* Choose setjmp as exception implementation */
+#ifndef __EX_MCTX_SJLJ__
+#define __EX_MCTX_SJLJ__
+#endif 
 
-#endif /* #ifndef __XBT_BORLAND_COMPILER_CONFIG_H__ */
\ No newline at end of file
+#endif /* #ifndef __XBT_BORLAND_COMPILER_CONFIG_H__ */