X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d2c6d00f1e8b5d3bb8ab17ff60f0c3833d42e3e..645e4944596e341e20d7288a610b8a4aab5ac98a:/include/xbt/misc.h

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 0a97552880..91693a6665 100644
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -21,12 +21,14 @@
 # define _XBT_GNUC_FORMAT( arg_idx )                \
 		   __attribute__((__format_arg__ (arg_idx)))
 # define _XBT_GNUC_NORETURN __attribute__((__noreturn__))
+# define _XBT_GNUC_UNUSED  __attribute__((unused))
 
 #else   /* !__GNUC__ */
 # define _XBT_GNUC_PRINTF( format_idx, arg_idx )
 # define _XBT_GNUC_SCANF( format_idx, arg_idx )
 # define _XBT_GNUC_FORMAT( arg_idx )
 # define _XBT_GNUC_NORETURN
+# define _XBT_GNUC_UNUSED
 
 #endif  /* !__GNUC__ */
 
@@ -34,15 +36,25 @@
 
 #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
+# else
+#    define XBT_INLINE  inline
+#endif
 
 
 #ifndef max
@@ -57,33 +69,30 @@
 
 #define XBT_MAX_CHANNEL 10 /* FIXME: killme */
 /*! C++ users need love */
-#ifndef BEGIN_DECL
+#ifndef SG_BEGIN_DECL
 # ifdef __cplusplus
-#  define BEGIN_DECL() extern "C" {
+#  define SG_BEGIN_DECL() extern "C" {
 # else
-#  define BEGIN_DECL() 
+#  define SG_BEGIN_DECL() 
 # endif
 #endif
 
 /*! C++ users need love */
-#ifndef END_DECL
+#ifndef SG_END_DECL
 # ifdef __cplusplus
-#  define END_DECL() }
+#  define SG_END_DECL() }
 # else
-#  define END_DECL() 
+#  define SG_END_DECL() 
 # endif
 #endif
 /* End of cruft for C++ */
 
-BEGIN_DECL()
-/* Dunno where to place this: needed by config and amok */
-typedef struct {  
-   char *name;
-   int port;
-} xbt_host_t;
+SG_BEGIN_DECL()
 
 const char *xbt_procname(void);
 
-END_DECL()
+#define XBT_BACKTRACE_SIZE 10 /* FIXME: better place? Do document */
+   
+SG_END_DECL()
 
 #endif /* XBT_MISC_H */