Taking in consideration inline keyword for borland compiler.

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

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 4c01db9087b4b6494da473d57e1b7f1ba29ab222..81282b64e7c84bc77ce6b87b4b0ebf2dc56722e9 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -36,15 +36,23 @@
 
 #if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
 # define _XBT_FUNCTION __FUNCTION__
-# define _XBT_INLINE inline
 #elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 # define _XBT_FUNC__ __func__      /* ISO-C99 compliant */
-# define _XBT_INLINE inline
 #else
 # define _XBT_FUNCTION "function"
-# define _XBT_INLINE 
 #endif
 
+#ifndef __cplusplus
+#    if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
+#        define XBT_INLINE inline
+#    elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+#        define XBT_INLINE inline
+#    elif defined(__BORLANDC__) && !defined(__STRICT_ANSI__)
+#        define XBT_INLINE __inline
+#    else
+#        define XBT_INLINE
+#    endif
+#endif
 
 
 #ifndef max
@@ -81,17 +89,6 @@ SG_BEGIN_DECL()
 
 const char *xbt_procname(void);
 
-
-/* Generic function type */
-
-   typedef void (void_f_ppvoid_t)(void**);
-   typedef void (void_f_pvoid_t) (void*);
-   typedef void (*void_f_void_t) (void);
-
-   typedef int  (int_f_pvoid_pvoid_t) (void*,void*);
-   
-   typedef int  (*int_f_void_t)   (void); /* FIXME: rename it to int_pf_void_t */
-
 #define XBT_BACKTRACE_SIZE 10 /* FIXME: better place? Do document */
    
 SG_END_DECL()