summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivmai <ivmai>2011-02-19 11:07:15 +0000
committerIvan Maidanski <ivmai@mail.ru>2011-07-25 16:03:26 +0400
commit52ec0c66a426e19c5b99138146b4e22f15dde72e (patch)
tree20232b885dcee6e085753a0ee8c5f7f1ff03de1c
parent1e16e9d73f1a93330389ca20e37daa1ce2bca3b7 (diff)
downloadlibatomic_ops-52ec0c66a426e19c5b99138146b4e22f15dde72e.tar.gz
2011-02-19 Ivan Maidanski <ivmai@mail.ru>
* src/atomic_ops.c: Explicitly define AO_USE_NO_SIGNALS and AO_USE_NANOSLEEP for NaCl.
-rw-r--r--ChangeLog5
-rw-r--r--src/atomic_ops.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c4ed94..cd06a13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-02-19 Ivan Maidanski <ivmai@mail.ru>
+ * src/atomic_ops.c: Explicitly define AO_USE_NO_SIGNALS and
+ AO_USE_NANOSLEEP for NaCl.
+
+2011-02-19 Ivan Maidanski <ivmai@mail.ru>
+
* aclocal.m4: Regenerate (by autoreconf -vif using autoconf-2.68,
automake-1.11.1 and libtool-2.4).
* configure: Ditto.
diff --git a/src/atomic_ops.c b/src/atomic_ops.c
index 39d7e60..66fba0d 100644
--- a/src/atomic_ops.c
+++ b/src/atomic_ops.c
@@ -32,6 +32,13 @@
# include "config.h"
#endif
+#if defined(__native_client__) && !defined(AO_USE_NO_SIGNALS) \
+ && !defined(AO_USE_NANOSLEEP)
+ /* Since NaCl is not recognized by configure yet, we do it here. */
+# define AO_USE_NO_SIGNALS
+# define AO_USE_NANOSLEEP
+#endif
+
#if defined(AO_USE_WIN32_PTHREADS) && !defined(AO_USE_NO_SIGNALS)
# define AO_USE_NO_SIGNALS
#endif