X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf108868b4eeed4d0d9d343bc68557d7814e18c0..96f27c279bcb5dd32cf0e8af04bd273240d298ef:/include/xbt/base.h diff --git a/include/xbt/base.h b/include/xbt/base.h index 11800076eb..a1b6319488 100644 --- 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,67 +53,10 @@ # 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 -#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 +# define XBT_ALWAYS_INLINE inline #endif /* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */ @@ -133,8 +73,7 @@ /* * Expands to `one' if there is only one argument for the variadic part. * Otherwise, expands to `more'. - * Works with up to 63 arguments, which is the maximum mandated by the C99 - * standard. + * Works with up to 63 arguments, which is the maximum mandated by the C99 standard. */ #define _XBT_IF_ONE_ARG(one, more, ...) \ _XBT_IF_ONE_ARG_(__VA_ARGS__, \ @@ -155,58 +94,33 @@ 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 _XBT_WIN32 -# ifndef _XBT_CALL -# define _XBT_CALL __cdecl -# endif -#else -# define _XBT_CALL -#endif - /* Handle import/export stuff * * Rational of XBT_PUBLIC: * * This is for library symbols visible from the application-land. - * Basically, any symbols defined in the include/directory must be - * like this (plus some other globals). + * Basically, any symbols defined in the include/directory must be like this (plus some other globals). * * UNIX coders should just think of it as a special way to say "extern". * - * * If you build the DLL, define the DLL_EXPORT symbol so that all symbols - * actually get exported by this file. - - * * If you do a static windows compilation, define DLL_STATIC, both when - * compiling the application files and when compiling the library. - * - * * If you link your application against the DLL or if you do a UNIX build, - * don't do anything special. This file will do the right thing for you - * by default. + * * If you build the DLL, define the DLL_EXPORT symbol so that all symbols actually get exported by this file. * + * * If you link your application against the DLL or if you do a UNIX build, don't do anything special. This file + * will do the right thing for you by default. * * Rational of XBT_EXPORT_NO_IMPORT: (windows-only) * * Symbols which must be exported in the DLL, but not imported from it. * - * * This is obviously useful for initialized globals (which cannot be - * extern or similar). - * * This is also used in the log mechanism where a macro creates the - * variable automatically. When the macro is called from within SimGrid, - * the symbol must be exported, but when called from within the client - * code, it must not try to retrieve the symbol from the DLL since it's - * not in there. + * * This is obviously useful for initialized globals (which cannot be extern or similar). + * * This is also used in the log mechanism where a macro creates the variable automatically. When the macro is + * called from within SimGrid, the symbol must be exported, but when called from within the client code, it must + * not try to retrieve the symbol from the DLL since it's not in there. * * Rational of XBT_IMPORT_NO_EXPORT: (windows-only) - * * Symbols which must be imported from the DLL, but not explicitly - * exported from it. + * * Symbols which must be imported from the DLL, but not explicitly exported from it. * - * * The root log category is already exported, but not imported explicitly - * when creating a subcategory since we cannot import the parent category - * to deal with the fact that the parent may be in application space, not - * DLL space. + * * The root log category is already exported, but not imported explicitly when creating a subcategory since we + * cannot import the parent category to deal with the fact that the parent may be in application space, not DLL + * space. */ /* Build the DLL */ @@ -218,17 +132,8 @@ # define XBT_PUBLIC_CLASS class __declspec(dllexport) # define XBT_PRIVATE -/* Pack everything up statically */ -#elif defined(DLL_STATIC) -# define XBT_PUBLIC(type) type -# define XBT_EXPORT_NO_IMPORT(type) type -# define XBT_IMPORT_NO_EXPORT(type) type -# define XBT_PUBLIC_DATA(type) extern type -# define XBT_PUBLIC_CLASS class -# define XBT_PRIVATE - /* Link against the DLL */ -#elif (defined(_XBT_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC)) +#elif (defined(_WIN32) && !defined(DLL_EXPORT)) # define XBT_PUBLIC(type) __declspec(dllimport) type # define XBT_EXPORT_NO_IMPORT(type) type # define XBT_IMPORT_NO_EXPORT(type) __declspec(dllimport) type @@ -254,28 +159,6 @@ #endif -#ifdef _MSC_VER /* MSVC has no ssize_t, and I fail to use the SSIZE_T declared in BaseTsd.h */ - #if defined(_WIN64) - typedef __int64 ssize_t; - #else - typedef long ssize_t; - #endif - -/* Microsoft wants to improve the code quality blah blah blah */ -/* See: https://msdn.microsoft.com/en-us/library/8ef0s5kh.aspx */ - /* warning C4996: '_strdup': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. */ - #define _CRT_NONSTDC_NO_WARNINGS - /* warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. */ - #define _CRT_SECURE_NO_WARNINGS -#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