Mercurial > hg > nginx

comparison src/os/unix/ngx_freebsd_init.c @ 4716:d1415d1e7a6b stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 02 Jul 2012 15:37:49 +0000
parents d620f497c50f
children 15a7deeaa19a
comparison
equal deleted inserted replaced
4715:474bbe8ca79c 4716:d1415d1e7a6b
74 void 74 void
75 ngx_debug_init() 75 ngx_debug_init()
76 { 76 {
77 #if (NGX_DEBUG_MALLOC) 77 #if (NGX_DEBUG_MALLOC)
78 78
79 #if __FreeBSD_version >= 500014 79 #if __FreeBSD_version >= 500014 && __FreeBSD_version < 1000011
80 _malloc_options = "J"; 80 _malloc_options = "J";
81 #else 81 #elif __FreeBSD_version < 500014
82 malloc_options = "J"; 82 malloc_options = "J";
83 #endif 83 #endif
84 84
85 ngx_debug_malloc = 1; 85 ngx_debug_malloc = 1;
86 86