Revert "thread_local is C++11, remove the portability layer"

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

diff --git a/include/xbt/base.h b/include/xbt/base.h
index f79b495..bada2f8 100644 (file)
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -16,9 +16,6 @@
   #define _GNU_SOURCE
 #endif
 
-/* Attributes are only in recent versions of GCC */
-#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))
-
 /* On MinGW, stdio.h defines __MINGW_PRINTF_FORMAT and __MINGW_SCANF_FORMAT
    which are the suitable format style (either gnu_printf or ms_printf)
    depending on which version is available (__USE_MINGW_ANSI_STDIO): */
@@ -56,65 +53,14 @@
 # endif
 # undef _XBT_NEED_INIT_PRAGMA
 
-#elif defined(_MSC_VER) /* Microsoft Visual Thing */
-# define XBT_ATTRIB_PRINTF( format_idx, arg_idx )
-# define XBT_ATTRIB_SCANF( format_idx, arg_idx )
-# define XBT_ATTRIB_NORETURN __declspec(noreturn)
-# define XBT_ATTRIB_UNUSED
-# define _XBT_GNUC_CONSTRUCTOR(prio)
-# define _XBT_GNUC_DESTRUCTOR(prio)
-# define _XBT_NEED_INIT_PRAGMA 1
-#else
-# define XBT_ATTRIB_PRINTF( format_idx, arg_idx )
-# define XBT_ATTRIB_SCANF( format_idx, arg_idx )
-# define XBT_ATTRIB_NORETURN
-# define XBT_ATTRIB_UNUSED
-# define _XBT_GNUC_CONSTRUCTOR(prio)
-# define _XBT_GNUC_DESTRUCTOR(prio)
-# define _XBT_NEED_INIT_PRAGMA 1
-
-#endif                          /* gcc or MSVC else */
-
-/* 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 */
-#else
-# define _XBT_FUNCTION "function"
-#endif
-
-#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)
-#        define XBT_INLINE inline
-#    else
-#        define XBT_INLINE
-#    endif
-#  else
-#     if defined (_MSC_VER)
-#       define XBT_INLINE __inline
-#     else
-#       define XBT_INLINE  inline
-#     endif
-#  endif /* __cplusplus */
-#endif
-
 #if defined(__GNUC__)
 #   define XBT_ALWAYS_INLINE inline __attribute__ ((always_inline))
 #else
-#   define XBT_ALWAYS_INLINE XBT_INLINE
+#   define XBT_ALWAYS_INLINE inline
 #endif
 
 #if defined(__GNUC__)
 #   define XBT_THREAD_LOCAL __thread
-#elif defined(_MSC_VER)
-#   define XBT_THREAD_LOCAL __declspec(thread)
 #else
 #   define XBT_THREAD_LOCAL No thread local on this architecture
 #endif
@@ -154,19 +100,6 @@
                          a16, a15, a14, a13, a12, a11, a10, a9,         \
                          a8, a7, a6, a5, a4, a3, a2, a1, N, ...) N
 
-/*
- * Function calling convention (not used for now)
- * http://unixwiz.net/techtips/win32-callconv.html <-- good documentation
- */
-
-#ifdef _WIN32
-#  ifndef _XBT_CALL
-#    define _XBT_CALL __cdecl
-#   endif
-#else
-#  define _XBT_CALL
-#endif
-
 /* Handle import/export stuff
  *
  * Rational of XBT_PUBLIC:
@@ -232,13 +165,6 @@
 
 #endif
 
-#if !defined (max) && !defined(__cplusplus)
-#  define max(a,b)  (((a) > (b)) ? (a) : (b))
-#endif
-#if !defined (min) && !defined(__cplusplus)
-#  define min(a,b)  (((a) < (b)) ? (a) : (b))
-#endif
-
 #define TRUE  1
 #define FALSE 0