From b8365983df66a8bde31d4df2fd477ca31e964d6d Mon Sep 17 00:00:00 2001 From: cherierm Date: Fri, 29 Sep 2006 08:52:17 +0000 Subject: [PATCH] Taking in consideration inline keyword for borland compiler. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2845 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/xbt/misc.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/include/xbt/misc.h b/include/xbt/misc.h index 1e8f77f726..81282b64e7 100644 --- a/include/xbt/misc.h +++ b/include/xbt/misc.h @@ -36,13 +36,22 @@ #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 -- 2.20.1