diff options
| author | Erlang/OTP <[email protected]> | 2014-07-01 13:58:34 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-07-01 13:58:34 +0200 |
| commit | 2387c54c1ffe02a5f7f1d9a097c6aa71553a16b8 (patch) | |
| tree | 56650b96db143ef382560a48a27e8f9669a80197 /erts/include/internal/ethread.h | |
| parent | 53f1678f15871505211ba574573247acc37ebb60 (diff) | |
| parent | fbb4d5a85baaeb0a946a00e5994fc1f4a12b2855 (diff) | |
| download | otp-2387c54c1ffe02a5f7f1d9a097c6aa71553a16b8.tar.gz otp-2387c54c1ffe02a5f7f1d9a097c6aa71553a16b8.tar.bz2 otp-2387c54c1ffe02a5f7f1d9a097c6aa71553a16b8.zip | |
Merge branch 'egil/fix-ethr-force-inline/OTP-12010' into maint-17
* egil/fix-ethr-force-inline/OTP-12010:
vxworks: Fix SYSTEMD_DAEMON_LIBS in configure
erts: Separate ethread inlining from ethread.h
Diffstat (limited to 'erts/include/internal/ethread.h')
| -rw-r--r-- | erts/include/internal/ethread.h | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h index 31d19902f5..72c054b588 100644 --- a/erts/include/internal/ethread.h +++ b/erts/include/internal/ethread.h @@ -31,6 +31,7 @@ #endif #include <stdlib.h> +#include "ethread_inline.h" #include "erl_errno.h" #if defined(DEBUG) @@ -51,31 +52,6 @@ # endif #endif -#if !defined(__GNUC__) -# define ETHR_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) 0 -#elif !defined(__GNUC_MINOR__) -# define ETHR_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) \ - ((__GNUC__ << 24) >= (((MAJ) << 24) | ((MIN) << 12) | (PL))) -#elif !defined(__GNUC_PATCHLEVEL__) -# define ETHR_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) \ - (((__GNUC__ << 24) | (__GNUC_MINOR__ << 12)) >= (((MAJ) << 24) | ((MIN) << 12) | (PL))) -#else -# define ETHR_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) \ - (((__GNUC__ << 24) | (__GNUC_MINOR__ << 12) | __GNUC_PATCHLEVEL__) >= (((MAJ) << 24) | ((MIN) << 12) | (PL))) -#endif - -#undef ETHR_INLINE -#if defined(__GNUC__) -# define ETHR_INLINE __inline__ -# if ETHR_AT_LEAST_GCC_VSN__(3, 1, 1) -# define ETHR_FORCE_INLINE __inline__ __attribute__((__always_inline__)) -# else -# define ETHR_FORCE_INLINE __inline__ -# endif -#elif defined(__WIN32__) -# define ETHR_INLINE __forceinline -# define ETHR_FORCE_INLINE __forceinline -#endif #if defined(ETHR_DEBUG) || !defined(ETHR_INLINE) || ETHR_XCHK \ || (defined(__GNUC__) && defined(ERTS_MIXED_CYGWIN_VC)) # undef ETHR_INLINE |