aboutsummaryrefslogtreecommitdiff
path: root/src/os/unix
diff options
context:
space:
mode:
Diffstat (limited to 'src/os/unix')
-rw-r--r--src/os/unix/ngx_atomic.h6
-rw-r--r--src/os/unix/ngx_freebsd_init.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/os/unix/ngx_atomic.h b/src/os/unix/ngx_atomic.h
index 746a71515..9710855aa 100644
--- a/src/os/unix/ngx_atomic.h
+++ b/src/os/unix/ngx_atomic.h
@@ -12,7 +12,7 @@
#include <ngx_core.h>
-#if ( __i386__ )
+#if ( __i386__ || __i386 )
#define NGX_HAVE_ATOMIC_OPS 1
@@ -109,7 +109,7 @@ ngx_atomic_cmp_set(ngx_atomic_t *lock, ngx_atomic_uint_t old,
}
-#elif ( __amd64__ )
+#elif ( __amd64__ || __amd64 )
#define NGX_HAVE_ATOMIC_OPS 1
@@ -183,7 +183,7 @@ ngx_atomic_cmp_set(ngx_atomic_t *lock, ngx_atomic_uint_t old,
}
-#elif ( __sparc__ )
+#elif ( __sparc__ || __sparcv9 )
#define NGX_HAVE_ATOMIC_OPS 1
diff --git a/src/os/unix/ngx_freebsd_init.c b/src/os/unix/ngx_freebsd_init.c
index 8610a5638..f82a6ac20 100644
--- a/src/os/unix/ngx_freebsd_init.c
+++ b/src/os/unix/ngx_freebsd_init.c
@@ -77,7 +77,7 @@ sysctl_t sysctls[] = {
void
ngx_debug_init()
{
-#if (NGX_DEBUG && !NGX_NO_DEBUG_MALLOC)
+#if (NGX_DEBUG_MALLOC)
#if __FreeBSD_version >= 500014
_malloc_options = "J";