aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2010-12-16 14:30:20 +0100
committerRickard Green <[email protected]>2010-12-16 14:30:20 +0100
commit059606a330e8e86305699f60de144102560cb57b (patch)
tree0b13c54aefeb4165944afa968de17d5520812c4b
parent2bfd5a25adfc87d7f83663e313d619050fdbd26c (diff)
parent4768e26e0acb2ebd12c08bc5599b98dc1ff92094 (diff)
downloadotp-059606a330e8e86305699f60de144102560cb57b.tar.gz
otp-059606a330e8e86305699f60de144102560cb57b.tar.bz2
otp-059606a330e8e86305699f60de144102560cb57b.zip
Merge branch 'rickard/atomic-type/OTP-8974' into dev
* rickard/atomic-type/OTP-8974: Unbreak atomic fallback
-rw-r--r--erts/lib_src/common/ethr_atomics.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/lib_src/common/ethr_atomics.c b/erts/lib_src/common/ethr_atomics.c
index 77694e5952..94557d904a 100644
--- a/erts/lib_src/common/ethr_atomics.c
+++ b/erts/lib_src/common/ethr_atomics.c
@@ -43,7 +43,7 @@ ethr_init_atomics(void)
{
int i;
for (i = 0; i < (1 << ETHR_ATOMIC_ADDR_BITS); i++) {
- res = ethr_spinlock_init(&ethr_atomic_protection__[i].u.lck);
+ int res = ethr_spinlock_init(&ethr_atomic_protection__[i].u.lck);
if (res != 0)
return res;
}