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
s/_XBT_GNUC_FUNCTION/_XBT_FUNCTION/ (that's how to get __FUNCTION__ portably)
[simgrid.git]
/
include
/
xbt
/
misc.h
diff --git
a/include/xbt/misc.h
b/include/xbt/misc.h
index
22eb219
..
0a97552
100644
(file)
--- a/
include/xbt/misc.h
+++ b/
include/xbt/misc.h
@@
-33,11
+33,13
@@
/* inline and __FUNCTION__ are only in GCC when -ansi is off */
#if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
/* inline and __FUNCTION__ are only in GCC when -ansi is off */
#if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
-
-# define _XBT_GNUC_FUNCTION __FUNCTION__
+# 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_INLINE inline
#else
-# define _XBT_
GNUC_
FUNCTION "function"
+# define _XBT_FUNCTION "function"
# define _XBT_INLINE
#endif
# define _XBT_INLINE
#endif