[nginx] svn commit: r4717 - in branches/stable-1.2: . src/os/unix

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-07-02 15:37:49 +0000 (Mon, 02 Jul 2012)
New Revision: 4717
URL: http://trac.nginx.org/nginx/changeset/4717/nginx

Log:
Merge of r4646: jemalloc 3.0.0 compatibility.

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:
   branches/stable-1.2/
   branches/stable-1.2/src/os/unix/ngx_freebsd_init.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-07-02 15:35:22 UTC (rev 4716)
+++ branches/stable-1.2	2012-07-02 15:37:49 UTC (rev 4717)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4645,4674-4676
+/trunk:4611-4632,4636-4646,4674-4676
\ No newline at end of property
Modified: branches/stable-1.2/src/os/unix/ngx_freebsd_init.c
===================================================================
--- branches/stable-1.2/src/os/unix/ngx_freebsd_init.c	2012-07-02 15:35:22 UTC (rev 4716)
+++ branches/stable-1.2/src/os/unix/ngx_freebsd_init.c	2012-07-02 15:37:49 UTC (rev 4717)
@@ -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