[From A. Giersch] Fix the following compilation errors in ICO-C99 mode:

[simgrid.git] / include / xbt / misc.h

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 5ee2661..94900ff 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -40,7 +40,7 @@
 #if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
 # define _XBT_FUNCTION __FUNCTION__
 #elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
-# define _XBT_FUNC__ __func__   /* ISO-C99 compliant */
+# define _XBT_FUNCTION __func__   /* ISO-C99 compliant */
 #else
 # define _XBT_FUNCTION "function"
 #endif
@@ -55,8 +55,12 @@
 #    else
 #        define XBT_INLINE
 #    endif
-# else
-#    define XBT_INLINE  inline
+#else
+#       if defined (__VISUALC__)
+#              define XBT_INLINE __inline
+#       else
+#      define XBT_INLINE  inline
+#       endif
 #endif
 
 /* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */
@@ -75,7 +79,7 @@
  * Function calling convention (not used for now) 
  */
 
-#ifdef _WIN32
+#ifdef _XBT_WIN32
 #  ifndef _XBT_CALL
 #    define _XBT_CALL __cdecl
 #   endif
@@ -139,9 +143,8 @@
 #  define XBT_IMPORT_NO_EXPORT(type)  type
 #  define XBT_PUBLIC_DATA(type)       extern type
 
-
 /* Link against the DLL */
-#elif (defined(_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC))
+#elif (defined(_XBT_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC))
 #  define XBT_PUBLIC(type)             __declspec(dllimport) type
 #  define XBT_EXPORT_NO_IMPORT(type)   type
 #  define XBT_IMPORT_NO_EXPORT(type)   __declspec(dllimport) type