2011-02-19 Ivan Maidanski <ivmai@mail.ru>

	* src/atomic_ops.c: Explicitly define AO_USE_NO_SIGNALS and
	AO_USE_NANOSLEEP for NaCl.

diff --git a/ChangeLog b/ChangeLog
index 3c4ed940defdab60ab6fb726fdd636a48335dd68..cd06a13d7b2309ed48aaa28058a408ce9c6efb48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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,

diff --git a/src/atomic_ops.c b/src/atomic_ops.c
index 39d7e608c8d83b4ebd8ffe836229dfcbd8c13afb..66fba0df2250c832e028dcb7bb8d8a5648cf5930 100644 (file)
--- 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