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
chainsend: fix compilation errors
[simgrid.git]
/
include
/
xbt
/
misc.h
diff --git
a/include/xbt/misc.h
b/include/xbt/misc.h
index
485598b
..
a3062a1
100644
(file)
--- a/
include/xbt/misc.h
+++ b/
include/xbt/misc.h
@@
-1,4
+1,4
@@
-/* xbt.h - Public interface to the xbt (
gras
's toolbox) */
+/* xbt.h - Public interface to the xbt (
simgrid
's toolbox) */
/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
* All rights reserved. */
/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
* All rights reserved. */
@@
-9,12
+9,17
@@
#ifndef XBT_MISC_H
#define XBT_MISC_H
#ifndef XBT_MISC_H
#define XBT_MISC_H
+/* Define _GNU_SOURCE for getline, isfinite, etc. */
+#ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+#endif
+
/* Attributes are only in recent versions of GCC */
#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))
# define _XBT_GNUC_PRINTF( format_idx, arg_idx ) \
/* Attributes are only in recent versions of GCC */
#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))
# define _XBT_GNUC_PRINTF( format_idx, arg_idx ) \
-
__attribute__((__format__ (__printf__, format_idx, arg_idx)))
+ __attribute__((__format__ (__printf__, format_idx, arg_idx)))
# define _XBT_GNUC_SCANF( format_idx, arg_idx ) \
# define _XBT_GNUC_SCANF( format_idx, arg_idx ) \
-
__attribute__((__format__ (__scanf__, format_idx, arg_idx)))
+ __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
# define _XBT_GNUC_NORETURN __attribute__((__noreturn__))
# define _XBT_GNUC_UNUSED __attribute__((__unused__))
/* Constructor priorities exist since gcc 4.3. Apparently, they are however not
# define _XBT_GNUC_NORETURN __attribute__((__noreturn__))
# define _XBT_GNUC_UNUSED __attribute__((__unused__))
/* Constructor priorities exist since gcc 4.3. Apparently, they are however not
@@
-63,11
+68,11
@@
# define XBT_INLINE
# endif
# else
# define XBT_INLINE
# endif
# else
-#
if defined (__VISUALC__)
-#
define XBT_INLINE __inline
-#
else
-# define XBT_INLINE inline
-#
endif
+# if defined (__VISUALC__)
+# define XBT_INLINE __inline
+# else
+# define XBT_INLINE inline
+# endif
# endif /* __cplusplus */
#endif
# endif /* __cplusplus */
#endif
@@
-166,7
+171,7
@@
# define XBT_PUBLIC(type) __declspec(dllexport) type
# define XBT_EXPORT_NO_IMPORT(type) __declspec(dllexport) type
# define XBT_IMPORT_NO_EXPORT(type) type
# define XBT_PUBLIC(type) __declspec(dllexport) type
# define XBT_EXPORT_NO_IMPORT(type) __declspec(dllexport) type
# define XBT_IMPORT_NO_EXPORT(type) type
-# define XBT_PUBLIC_DATA(type)
__declspec(dllexport) type
+# define XBT_PUBLIC_DATA(type) __declspec(dllexport) type
/* Pack everything up statically */
#elif defined(DLL_STATIC)
/* Pack everything up statically */
#elif defined(DLL_STATIC)
@@
-177,10
+182,10
@@
/* Link against the DLL */
#elif (defined(_XBT_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC))
/* Link against the DLL */
#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
-# define XBT_PUBLIC_DATA(type)
__declspec(dllimport) type
+# define XBT_PUBLIC(type)
__declspec(dllimport) type
+# define XBT_EXPORT_NO_IMPORT(type)
type
+# define XBT_IMPORT_NO_EXPORT(type)
__declspec(dllimport) type
+# define XBT_PUBLIC_DATA(type) __declspec(dllimport) type
/* UNIX build */
#else
/* UNIX build */
#else
@@
-191,10
+196,10
@@
#endif
#if !defined (max) && !defined(__cplusplus)
#endif
#if !defined (max) && !defined(__cplusplus)
-# define max(a,b)
(((a) > (b)) ? (a) : (b))
+# define max(a,b) (((a) > (b)) ? (a) : (b))
#endif
#if !defined (min) && !defined(__cplusplus)
#endif
#if !defined (min) && !defined(__cplusplus)
-# define min(a,b)
(((a) < (b)) ? (a) : (b))
+# define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
#define TRUE 1
#endif
#define TRUE 1