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

diff --git a/src/win32/compiler/borland.h b/src/win32/compiler/borland.h
index 7a0d2bbb4a..6317ef75db 100644
--- a/src/win32/compiler/borland.h
+++ b/src/win32/compiler/borland.h
@@ -194,6 +194,11 @@
 	#define NEED_ASPRINTF	1
 #endif
 
+/*#ifdef NEED_ASPRINTF
+#undef NEED_ASPRINTF
+#endif*/
+
+
 /* enable the vasprintf replacement */
 #if  !defined(NEED_VASPRINTF)
 	#define NEED_VASPRINTF	1
@@ -201,11 +206,10 @@
 
 /* "disable the snprintf replacement ( this function is broken on system v only" */
 
-/* FIXEME TO ANALYZE
+/* FIXME TO ANALYZE */
 #if defined(PREFER_PORTABLE_SNPRINTF)
 	#undef PREFER_PORTABLE_SNPRINTF	
 #endif
-*/
 
 #if !defined(PREFER_PORTABLE_SNPRINTF)
 	#define PREFER_PORTABLE_SNPRINTF	
@@ -343,20 +347,18 @@ 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
 
-#if defined(_XBT_DESIGNATED_DLL)
-	#define _XBT_CALL __cdecl __export
-#elif defined(_RTLDLL)
-	#define  _XBT_CALL __cdecl __import
-#else
-	#define  _XBT_CALL __cdecl
+#ifndef _XBT_CALL
+	#if defined(_XBT_DESIGNATED_DLL)
+		#define _XBT_CALL __cdecl __export
+	#elif defined(_RTLDLL)
+		#define  _XBT_CALL __cdecl __import
+	#else
+		#define  _XBT_CALL __cdecl
+	#endif
 #endif
 
 /* auto enable thread safety and exceptions: */
@@ -368,37 +370,10 @@ the double. For now, GRAS requires the structures to be compacted. */
 	#define _REENTRANT 1
 #endif
 
-#if defined ( __DEBUG ) && ( __DEBUG > 1 )
-	#define _XBT_DEBUG
+#if(__BORLANDC__>= 0x500)
+	#define _XBT_HAS_NAMESPACES
 #endif
 
-#define _XBT_LIB_BASENAME "xbt"
-
-#define _XBT_EXPORT_DECLSPEC __declspec(dllexport)
-#define _XBT_IMPORT_DECLSPEC __declspec(dllimport)
-	
-#define _XBT_CLASS_EXPORT_DECLSPEC __declspec(dllexport)
-#define _XBT_CLASS_IMPORT_DECLSPEC __declspec(dllimport)
-
-    #if(__BORLANDC__>= 0x500)
-            #define _XBT_HAS_NAMESPACES
-    #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>
@@ -422,4 +397,13 @@ typedef int socklen_t;
 #define __EX_MCTX_SJLJ__
 #endif 
 
-#endif /* #ifndef __XBT_BORLAND_COMPILER_CONFIG_H__ */
\ No newline at end of file
+/* this is used in context managment. */
+#ifdef CONTEXT_UCONTEXT
+#undef CONTEXT_UCONTEXT
+#endif
+
+#ifndef CONTEXT_THREADS
+#define CONTEXT_THREADS
+#endif
+
+#endif /* #ifndef __XBT_BORLAND_COMPILER_CONFIG_H__ */