A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mc] Move MC malloc introspection code in simgrid::mc
[simgrid.git]
/
include
/
xbt
/
base.h
diff --git
a/include/xbt/base.h
b/include/xbt/base.h
index
a1b6319
..
9d4ea07
100644
(file)
--- a/
include/xbt/base.h
+++ b/
include/xbt/base.h
@@
-9,8
+9,6
@@
#ifndef XBT_BASE_H
#define XBT_BASE_H
#ifndef XBT_BASE_H
#define XBT_BASE_H
-#include "simgrid_config.h"
-
/* Define _GNU_SOURCE for getline, isfinite, etc. */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
/* Define _GNU_SOURCE for getline, isfinite, etc. */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
@@
-21,20
+19,14
@@
depending on which version is available (__USE_MINGW_ANSI_STDIO): */
#ifdef __MINGW32__
#include <stdio.h>
depending on which version is available (__USE_MINGW_ANSI_STDIO): */
#ifdef __MINGW32__
#include <stdio.h>
-#endif
-#if defined(__MINGW32__) && defined(__MINGW_PRINTF_FORMAT)
# define XBT_ATTRIB_PRINTF( format_idx, arg_idx ) \
__attribute__((__format__ (__MINGW_PRINTF_FORMAT, format_idx, arg_idx)))
# define XBT_ATTRIB_PRINTF( format_idx, arg_idx ) \
__attribute__((__format__ (__MINGW_PRINTF_FORMAT, format_idx, arg_idx)))
-#else
- # define XBT_ATTRIB_PRINTF( format_idx, arg_idx ) \
- __attribute__((__format__ (__printf__, format_idx, arg_idx)))
-#endif
-
-#if defined(__MINGW32__) && defined(__MINGW_SCANF_FORMAT)
# define XBT_ATTRIB_SCANF( format_idx, arg_idx ) \
__attribute__((__MINGW_SCANF_FORMAT (__scanf__, format_idx, arg_idx)))
#else
# define XBT_ATTRIB_SCANF( format_idx, arg_idx ) \
__attribute__((__MINGW_SCANF_FORMAT (__scanf__, format_idx, arg_idx)))
#else
+ # define XBT_ATTRIB_PRINTF( format_idx, arg_idx ) \
+ __attribute__((__format__ (__printf__, format_idx, arg_idx)))
# define XBT_ATTRIB_SCANF( format_idx, arg_idx ) \
__attribute__((__format__ (__scanf__, format_idx, arg_idx)))
#endif
# define XBT_ATTRIB_SCANF( format_idx, arg_idx ) \
__attribute__((__format__ (__scanf__, format_idx, arg_idx)))
#endif
@@
-59,6
+51,12
@@
# define XBT_ALWAYS_INLINE inline
#endif
# define XBT_ALWAYS_INLINE inline
#endif
+#if defined(__GNUC__)
+# define XBT_THREAD_LOCAL __thread
+#else
+# define XBT_THREAD_LOCAL No thread local on this architecture
+#endif
+
/* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */
#ifdef MIN
# undef MIN
/* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */
#ifdef MIN
# undef MIN