Mercurial > hg > nginx

changeset 4645:f329a1d2127b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 23 May 2012 15:07:01 +0000
parents 95763fce86a8
children 959371df1806
files src/os/unix/ngx_freebsd_init.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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