diff options
| author | Rickard Green <[email protected]> | 2010-11-22 12:18:33 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-11-22 12:18:38 +0100 |
| commit | f7d51b976aceb0c3e2c48ad1be2df8b6fff6353d (patch) | |
| tree | f1736133e5786061c21fadb579727c56f6cf9e13 /erts | |
| parent | 412f67b09a03b590fddca1d4d36ff079a49cc911 (diff) | |
| parent | 5ca6bc623c4a82563df3947eca35b037bcd6e8c9 (diff) | |
| download | otp-f7d51b976aceb0c3e2c48ad1be2df8b6fff6353d.tar.gz otp-f7d51b976aceb0c3e2c48ad1be2df8b6fff6353d.tar.bz2 otp-f7d51b976aceb0c3e2c48ad1be2df8b6fff6353d.zip | |
Merge branch 'ta/fix-ethread-void-return' into dev
* ta/fix-ethread-void-return:
ethread: do not return from void ethr_atomic_set_relb
OTP-8944
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/include/internal/ethread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h index 931d692908..53fa1acdc2 100644 --- a/erts/include/internal/ethread.h +++ b/erts/include/internal/ethread.h @@ -759,7 +759,7 @@ ETHR_INLINE_FUNC_NAME_(ethr_atomic_set_relb)(ethr_atomic_t *var, long val) #ifdef ETHR_HAVE_NATIVE_ATOMICS ethr_native_atomic_set_relb(var, val); #else - return ETHR_INLINE_FUNC_NAME_(ethr_atomic_set)(var, val); + ETHR_INLINE_FUNC_NAME_(ethr_atomic_set)(var, val); #endif } |