Mercurial > hg > nginx

changeset 3378:5d17022a1e88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix libatomic usage on arm, cris, hppa, m68k, and sparc platforms
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 Dec 2009 15:32:38 +0000
parents 8de152fbb49d
children 0c517d0cabe0
files auto/lib/libatomic/conf src/os/unix/ngx_atomic.h
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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