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/lib_src/common/ethr_mutex.c | |
| 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/lib_src/common/ethr_mutex.c')
| -rw-r--r-- | erts/lib_src/common/ethr_mutex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/lib_src/common/ethr_mutex.c b/erts/lib_src/common/ethr_mutex.c index 72b44033ad..4e56efaf8b 100644 --- a/erts/lib_src/common/ethr_mutex.c +++ b/erts/lib_src/common/ethr_mutex.c @@ -1433,7 +1433,7 @@ void LeaveCriticalSection(CRITICAL_SECTION *cs) #define ETHR_CND_WAIT__ ((ethr_sint32_t) 0x11dead11) #define ETHR_CND_WAKEUP__ ((ethr_sint32_t) 0x11beef11) -static __forceinline void +static ETHR_FORCE_INLINE void cond_wakeup(ethr_ts_event *tse) { ETHR_ASSERT(ethr_atomic32_read(&tse->uaflgs) == ETHR_CND_WAIT__); @@ -1574,7 +1574,7 @@ ethr_cond_wait(ethr_cond *cnd, ethr_mutex *mtx) return 0; } -static __forceinline void +static ETHR_FORCE_INLINE void posix_compliant_mtx_enqueue(ethr_mutex *mtx, ethr_ts_event *tse_start, ethr_ts_event *tse_end) @@ -1614,7 +1614,7 @@ posix_compliant_mtx_enqueue(ethr_mutex *mtx, } } -static __forceinline void +static ETHR_FORCE_INLINE void enqueue_cond_wakeups(ethr_ts_event *queue, int posix_compliant) { if (queue) { |