fix libatomic usage on arm, cris, hppa, m68k, and sparc platforms

diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf
index 214feb37a92f826acb4d97e57fefb4f9ba6d526c..5cf16f381b5aac4200d560e37623294468dead42 100644 (file)
--- a/auto/lib/libatomic/conf
+++ b/auto/lib/libatomic/conf
@@ -14,7 +14,8 @@ else
     ngx_feature="atomic_ops library"
     ngx_feature_name=NGX_HAVE_LIBATOMIC
     ngx_feature_run=yes
-    ngx_feature_incs="#include <atomic_ops.h>"
+    ngx_feature_incs="#define AO_REQUIRE_CAS
+                      #include <atomic_ops.h>"
     ngx_feature_path=
     ngx_feature_libs="-latomic_ops"
     ngx_feature_test="long  n = 0;

diff --git a/src/os/unix/ngx_atomic.h b/src/os/unix/ngx_atomic.h
index 39b3e6b7f0cc0a8d5fd14f183311041eb9a613b3..57826ffcfaf087b4763b091cf6347dabba84f84e 100644 (file)
--- a/src/os/unix/ngx_atomic.h
+++ b/src/os/unix/ngx_atomic.h
@@ -14,6 +14,7 @@
 
 #if (NGX_HAVE_LIBATOMIC)
 
+#define AO_REQUIRE_CAS
 #include <atomic_ops.h>
 
 #define NGX_HAVE_ATOMIC_OPS  1