diff options
| author | Rickard Green <[email protected]> | 2015-06-16 19:17:41 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-06-16 19:17:41 +0200 |
| commit | 89b42bb784e97584b3f3b3c3ff4946a945876a5c (patch) | |
| tree | b18fe244f4deb4ad77d033a921a882462130fa14 /erts/emulator/beam | |
| parent | dc35ae6cb4d7f067eef7a31cd2db34bd1c35e4bd (diff) | |
| parent | d18dd1ba7f7c874b1cbc2806822d134ea1546781 (diff) | |
| download | otp-89b42bb784e97584b3f3b3c3ff4946a945876a5c.tar.gz otp-89b42bb784e97584b3f3b3c3ff4946a945876a5c.tar.bz2 otp-89b42bb784e97584b3f3b3c3ff4946a945876a5c.zip | |
Merge branch 'rickard/glb-inline'
* rickard/glb-inline:
Unbreak global inlining
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/sys.h | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index cd53069872..78eb0bfe2b 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -20,6 +20,22 @@ #ifndef __SYS_H__ #define __SYS_H__ +#ifdef ERTS_INLINE +# ifndef ERTS_CAN_INLINE +# define ERTS_CAN_INLINE 1 +# endif +#else +# if defined(__GNUC__) +# define ERTS_CAN_INLINE 1 +# define ERTS_INLINE __inline__ +# elif defined(__WIN32__) +# define ERTS_CAN_INLINE 1 +# define ERTS_INLINE __inline +# else +# define ERTS_CAN_INLINE 0 +# define ERTS_INLINE +# endif +#endif #if defined(DEBUG) || defined(ERTS_ENABLE_LOCK_CHECK) # undef ERTS_CAN_INLINE @@ -94,23 +110,6 @@ typedef int ErtsSysFdType; typedef ERTS_SYS_FD_TYPE ErtsSysFdType; #endif -#ifdef ERTS_INLINE -# ifndef ERTS_CAN_INLINE -# define ERTS_CAN_INLINE 1 -# endif -#else -# if defined(__GNUC__) -# define ERTS_CAN_INLINE 1 -# define ERTS_INLINE __inline__ -# elif defined(__WIN32__) -# define ERTS_CAN_INLINE 1 -# define ERTS_INLINE __inline -# else -# define ERTS_CAN_INLINE 0 -# define ERTS_INLINE -# endif -#endif - #if !defined(__GNUC__) # define ERTS_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) 0 #elif !defined(__GNUC_MINOR__) |