diff options
| author | Rickard Green <[email protected]> | 2014-06-06 01:57:57 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-06 01:57:57 +0200 |
| commit | dd06ee01e06300725f46c85df18faace2d01d9d6 (patch) | |
| tree | 8cdc08ff7c6730971e32e9bde2c49d784755228e /erts/include/internal/win/ethr_membar.h | |
| parent | 8b4659d5246166cef9b8e9aa91c644e3b3ec66d5 (diff) | |
| parent | 4eabd78146594a9cd75eb9dc62ba449f7b6b8eb5 (diff) | |
| download | otp-dd06ee01e06300725f46c85df18faace2d01d9d6.tar.gz otp-dd06ee01e06300725f46c85df18faace2d01d9d6.tar.bz2 otp-dd06ee01e06300725f46c85df18faace2d01d9d6.zip | |
Merge branch 'jjhoo/mingw_compile_fix_forceinline/OTP-11945' into maint
* jjhoo/mingw_compile_fix_forceinline/OTP-11945:
Do not use __always_inline__ attribute unless gcc vsn >= 3.1.1
Add ETHR_FORCE_INLINE define to hide compiler specific directives
Diffstat (limited to 'erts/include/internal/win/ethr_membar.h')
| -rw-r--r-- | erts/include/internal/win/ethr_membar.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/include/internal/win/ethr_membar.h b/erts/include/internal/win/ethr_membar.h index 8237660b2c..a17f2459fc 100644 --- a/erts/include/internal/win/ethr_membar.h +++ b/erts/include/internal/win/ethr_membar.h @@ -63,13 +63,13 @@ do { \ #pragma intrinsic(_mm_sfence) #pragma intrinsic(_mm_lfence) -static __forceinline void +static ETHR_FORCE_INLINE void ethr_cfence__(void) { _ReadWriteBarrier(); } -static __forceinline void +static ETHR_FORCE_INLINE void ethr_mfence__(void) { #if ETHR_SIZEOF_PTR == 4 @@ -80,7 +80,7 @@ ethr_mfence__(void) _mm_mfence(); } -static __forceinline void +static ETHR_FORCE_INLINE void ethr_sfence__(void) { #if ETHR_SIZEOF_PTR == 4 @@ -91,7 +91,7 @@ ethr_sfence__(void) _mm_sfence(); } -static __forceinline void +static ETHR_FORCE_INLINE void ethr_lfence__(void) { #if ETHR_SIZEOF_PTR == 4 |