We need cmake 2.8 to compile simgrid

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

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 36bc11c..cefbc2f 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -23,7 +23,7 @@
 # define _XBT_GNUC_DESTRUCTOR __attribute__((__destructor__))
 # undef _XBT_NEED_INIT_PRAGMA
 
-#else /* !__GNUC__ */
+#else                           /* !__GNUC__ */
 # define _XBT_GNUC_PRINTF( format_idx, arg_idx )
 # define _XBT_GNUC_SCANF( format_idx, arg_idx )
 # define _XBT_GNUC_FORMAT( arg_idx )
@@ -33,19 +33,22 @@
 # define _XBT_GNUC_DESTRUCTOR
 # define  _XBT_NEED_INIT_PRAGMA 1
 
-#endif /* !__GNUC__ */
+#endif                          /* !__GNUC__ */
 
 /* inline and __FUNCTION__ are only in GCC when -ansi is off */
 
 #if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
 # define _XBT_FUNCTION __FUNCTION__
 #elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
-# define _XBT_FUNCTION __func__   /* ISO-C99 compliant */
+# define _XBT_FUNCTION __func__ /* ISO-C99 compliant */
 #else
 # define _XBT_FUNCTION "function"
 #endif
 
-#ifndef __cplusplus
+#ifdef DOXYGEN
+#  define XBT_INLINE
+#else
+#  ifndef __cplusplus
 #    if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
 #        define XBT_INLINE inline
 #    elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
@@ -55,12 +58,13 @@
 #    else
 #        define XBT_INLINE
 #    endif
-#else
-#       if defined (__VISUALC__)
-#              define XBT_INLINE __inline
-#       else
-#      define XBT_INLINE  inline
-#       endif
+#  else
+#         if defined (__VISUALC__)
+#                 define XBT_INLINE __inline
+#         else
+#       define XBT_INLINE  inline
+#         endif
+#  endif /* __cplusplus */
 #endif
 
 /* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */
@@ -194,4 +198,4 @@ XBT_PUBLIC(const char *) xbt_procname(void);
 #define XBT_BACKTRACE_SIZE 10   /* FIXME: better place? Do document */
 
 SG_END_DECL()
-#endif /* XBT_MISC_H */
+#endif                          /* XBT_MISC_H */