summaryrefslogtreecommitdiffhomepage
path: root/src/os/unix/ngx_atomic.h
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-08-06 17:07:28 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-08-06 17:07:28 +0000
commit20ce4fcbbf7c1504cc520905dfde1b2790011e31 (patch)
tree4d719fab466d77fd82c54e29eae01ab84ff70353 /src/os/unix/ngx_atomic.h
parenta24d4d23f770856762a7f3f11f29c0f8b517b1ab (diff)
downloadnginx-20ce4fcbbf7c1504cc520905dfde1b2790011e31.tar.gz
nginx-20ce4fcbbf7c1504cc520905dfde1b2790011e31.tar.bz2
Merge of r4760, r4761: -Wmissing-prototypes.
Fixed compilation with -Wmissing-prototypes. Added a commented out -Wmissing-prototypes to CFLAGS. It is commented out to not break builds with 3rd party modules.
Diffstat (limited to 'src/os/unix/ngx_atomic.h')
-rw-r--r--src/os/unix/ngx_atomic.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/os/unix/ngx_atomic.h b/src/os/unix/ngx_atomic.h
index 104ac376a..417cd86ff 100644
--- a/src/os/unix/ngx_atomic.h
+++ b/src/os/unix/ngx_atomic.h
@@ -48,7 +48,9 @@ typedef volatile ngx_atomic_uint_t ngx_atomic_t;
#include <libkern/OSAtomic.h>
/* "bool" conflicts with perl's CORE/handy.h */
+#if 0
#undef bool
+#endif
#define NGX_HAVE_ATOMIC_OPS 1