diff options
| author | Rickard Green <[email protected]> | 2014-06-06 01:58:19 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-06 01:58:19 +0200 |
| commit | 7372e3e8adc6cc9f0b59a4bc47ea0a1af3e5fd1f (patch) | |
| tree | 35325810d31ee92c4049326e2f6286609354cbf7 /erts/include/internal/win | |
| parent | c54a0025e6a4d152ba73e92a2007052ebde391bf (diff) | |
| parent | dd06ee01e06300725f46c85df18faace2d01d9d6 (diff) | |
| download | otp-7372e3e8adc6cc9f0b59a4bc47ea0a1af3e5fd1f.tar.gz otp-7372e3e8adc6cc9f0b59a4bc47ea0a1af3e5fd1f.tar.bz2 otp-7372e3e8adc6cc9f0b59a4bc47ea0a1af3e5fd1f.zip | |
Merge branch 'maint'
* maint:
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')
| -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 |