diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-12-07 15:32:38 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-12-07 15:32:38 +0000 |
| commit | 8f7c8f3c07038ce40e28cde141f936a8fd92eea9 (patch) | |
| tree | 1ac490770e1f6aed5db240752533406344d42b22 | |
| parent | eacd5d89b7d94c8422390c6cedac0501ab974c96 (diff) | |
| download | nginx-8f7c8f3c07038ce40e28cde141f936a8fd92eea9.tar.gz nginx-8f7c8f3c07038ce40e28cde141f936a8fd92eea9.zip | |
fix libatomic usage on arm, cris, hppa, m68k, and sparc platforms
| -rw-r--r-- | auto/lib/libatomic/conf | 3 | ||||
| -rw-r--r-- | src/os/unix/ngx_atomic.h | 1 |
2 files changed, 3 insertions, 1 deletions
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 |