diff options
| author | Rickard Green <[email protected]> | 2014-06-16 15:16:07 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-16 15:16:07 +0200 |
| commit | 42319ef8bf50bd6e607d6154a4ab1c041bb08551 (patch) | |
| tree | e458d40b33a753ffaea0885f277043cfe8a6a1bf | |
| parent | 09c5e12074516cfa0d6320a1de2a5bb1afd606a8 (diff) | |
| parent | 5fb0d815d3b418a605a479c6691e75cee197f3c9 (diff) | |
| download | otp-42319ef8bf50bd6e607d6154a4ab1c041bb08551.tar.gz otp-42319ef8bf50bd6e607d6154a4ab1c041bb08551.tar.bz2 otp-42319ef8bf50bd6e607d6154a4ab1c041bb08551.zip | |
Merge branch 'jjhoo/mingw_compile_fix_forceinline/OTP-11945' into maint
* jjhoo/mingw_compile_fix_forceinline/OTP-11945:
Fix redefinition of ETHR_FORCE_INLINE
| -rw-r--r-- | erts/include/internal/ethread.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h index 70e9c937e9..31d19902f5 100644 --- a/erts/include/internal/ethread.h +++ b/erts/include/internal/ethread.h @@ -80,6 +80,7 @@ || (defined(__GNUC__) && defined(ERTS_MIXED_CYGWIN_VC)) # undef ETHR_INLINE # define ETHR_INLINE +# undef ETHR_FORCE_INLINE # define ETHR_FORCE_INLINE # undef ETHR_TRY_INLINE_FUNCS #endif |