X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2fae50dec7ea8e3550c62dace3c0a3b57d0e1fa9..44d361c91bd348cd70ee6afbdf63a5c2a7406dc1:/include/xbt/misc.h?ds=sidebyside

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index be067f9497..cefbc2f98a 100644
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -6,8 +6,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "gras_config.h"
-
 #ifndef XBT_MISC_H
 #define XBT_MISC_H
 
@@ -20,12 +18,12 @@
 # define _XBT_GNUC_FORMAT( arg_idx )                \
 		   __attribute__((__format_arg__ (arg_idx)))
 # define _XBT_GNUC_NORETURN __attribute__((__noreturn__))
-# define _XBT_GNUC_UNUSED  __attribute__((unused))
+# define _XBT_GNUC_UNUSED  __attribute__((__unused__))
 # define _XBT_GNUC_CONSTRUCTOR __attribute__((__constructor__))
 # 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 )
@@ -35,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_FUNC__ __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)
@@ -57,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 */
@@ -81,7 +83,7 @@
  * Function calling convention (not used for now) 
  */
 
-#ifdef _WIN32
+#ifdef _XBT_WIN32
 #  ifndef _XBT_CALL
 #    define _XBT_CALL __cdecl
 #   endif
@@ -146,7 +148,7 @@
 #  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
@@ -196,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 */