From: Maxim Dounin <mdounin@mdounin.ru>
Date: Wed, 23 May 2012 15:07:01 +0000 (+0000)
Subject: Fixed compilation with -DNGX_DEBUG_MALLOC on FreeBSD 10.
X-Git-Tag: release-1.3.1~17
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=e1133ca60e051c0fa9c7af3425b9d4b5c140f7d3;p=nginx.git

Fixed compilation with -DNGX_DEBUG_MALLOC on FreeBSD 10.

After jemalloc 3.0.0 import there is no _malloc_options symbol, it has
been replaced with the malloc_conf one with a different syntax.
---

diff --git a/src/os/unix/ngx_freebsd_init.c b/src/os/unix/ngx_freebsd_init.c
index 57af44a20..aeeceaf25 100644
--- a/src/os/unix/ngx_freebsd_init.c
+++ b/src/os/unix/ngx_freebsd_init.c
@@ -76,9 +76,9 @@ ngx_debug_init()
 {
 #if (NGX_DEBUG_MALLOC)
 
-#if __FreeBSD_version >= 500014
+#if __FreeBSD_version >= 500014 && __FreeBSD_version < 1000011
     _malloc_options = "J";
-#else
+#elif __FreeBSD_version < 500014
     malloc_options = "J";
 #endif