From 8f7c8f3c07038ce40e28cde141f936a8fd92eea9 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 7 Dec 2009 15:32:38 +0000
Subject: fix libatomic usage on arm, cris, hppa, m68k, and sparc platforms

---
 auto/lib/libatomic/conf  | 3 ++-
 src/os/unix/ngx_atomic.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf
index 214feb37a..5cf16f381 100644
--- 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 39b3e6b7f..57826ffcf 100644
--- 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
-- 
cgit