From: cherierm <cherierm@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 10 Oct 2006 08:53:51 +0000 (+0000)
Subject: Avoids macro redefinitions in src/win32/compiler/borland.h.
X-Git-Tag: v3.3~2477
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1e1a28ccdb6a355c30b80e3d7db6c8166cd8c0e7

Avoids macro redefinitions in src/win32/compiler/borland.h.


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2882 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/win32/compiler/borland.h b/src/win32/compiler/borland.h
index 2af309bb3b..0f3ba951b3 100644
--- a/src/win32/compiler/borland.h
+++ b/src/win32/compiler/borland.h
@@ -351,12 +351,14 @@ the double. For now, GRAS requires the structures to be compacted. */
 /* 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: */
@@ -374,15 +376,26 @@ the double. For now, GRAS requires the structures to be compacted. */
 
 #define _XBT_LIB_BASENAME "xbt"
 
+#ifndef _XBT_EXPORT_DECLSPEC
 #define _XBT_EXPORT_DECLSPEC __declspec(dllexport)
+#endif
+
+#ifndef _XBT_IMPORT_DECLSPEC
 #define _XBT_IMPORT_DECLSPEC __declspec(dllimport)
-	
+#endif
+
+#ifndef _XBT_CLASS_EXPORT_DECLSPEC
 #define _XBT_CLASS_EXPORT_DECLSPEC __declspec(dllexport)
+#endif
+
+#ifndef _XBT_CLASS_IMPORT_DECLSPEC
 #define _XBT_CLASS_IMPORT_DECLSPEC __declspec(dllimport)
+#endif
 
-    #if(__BORLANDC__>= 0x500)
-            #define _XBT_HAS_NAMESPACES
-    #endif
+
+#if(__BORLANDC__>= 0x500)
+	#define _XBT_HAS_NAMESPACES
+#endif
 
 
 /* For open, read etc. file operations. */