aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-08-07 09:40:00 +0200
committerFredrik Gustafsson <[email protected]>2013-08-07 09:40:00 +0200
commit4c88eb1dcc10b6404bcc354aa3db09e7140246b3 (patch)
tree6b5cc5a5c842776fd8b3632c3a06491eb709a964 /erts
parent7674cd33ae4b4f6d97db2f80972a63fd712d5ca0 (diff)
parent3021fca734f71f8bae966ab67f1400d37f8927bc (diff)
downloadotp-4c88eb1dcc10b6404bcc354aa3db09e7140246b3.tar.gz
otp-4c88eb1dcc10b6404bcc354aa3db09e7140246b3.tar.bz2
otp-4c88eb1dcc10b6404bcc354aa3db09e7140246b3.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/include/internal/gcc/ethread.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/include/internal/gcc/ethread.h b/erts/include/internal/gcc/ethread.h
index fcfdc39441..365a3535cf 100644
--- a/erts/include/internal/gcc/ethread.h
+++ b/erts/include/internal/gcc/ethread.h
@@ -25,6 +25,9 @@
#ifndef ETHREAD_GCC_H__
#define ETHREAD_GCC_H__
+#if defined(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32) \
+ || defined(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64)
+
#ifndef ETHR_MEMBAR
# include "ethr_membar.h"
#endif
@@ -46,3 +49,5 @@
#endif
#endif
+
+#endif