From: ivmai Date: Sat, 19 Feb 2011 11:07:15 +0000 (+0000) Subject: 2011-02-19 Ivan Maidanski X-Git-Tag: libatomic_ops-7_2alpha6~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52ec0c66a426e19c5b99138146b4e22f15dde72e;p=platform%2Fupstream%2Flibatomic_ops.git 2011-02-19 Ivan Maidanski * src/atomic_ops.c: Explicitly define AO_USE_NO_SIGNALS and AO_USE_NANOSLEEP for NaCl. --- diff --git a/ChangeLog b/ChangeLog index 3c4ed94..cd06a13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-02-19 Ivan Maidanski + * src/atomic_ops.c: Explicitly define AO_USE_NO_SIGNALS and + AO_USE_NANOSLEEP for NaCl. + +2011-02-19 Ivan Maidanski + * 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