[nginx] svn commit: r4646 - trunk/src/os/unix

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-05-23 15:07:01 +0000 (Wed, 23 May 2012)
New Revision: 4646
URL: http://trac.nginx.org/nginx/changeset/4646/nginx

Log:
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.


Modified:
   trunk/src/os/unix/ngx_freebsd_init.c

Modified: trunk/src/os/unix/ngx_freebsd_init.c
===================================================================
--- trunk/src/os/unix/ngx_freebsd_init.c	2012-05-23 10:36:12 UTC (rev 4645)
+++ trunk/src/os/unix/ngx_freebsd_init.c	2012-05-23 15:07:01 UTC (rev 4646)
@@ -76,9 +76,9 @@
 {
 #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