diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-07-02 15:37:49 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-07-02 15:37:49 +0000 |
| commit | ef03533f89435d9490e3bc3c6fa13a3720339e0a (patch) | |
| tree | 274935ac84bc63d49dc9ddfef9dbf6cc38e50d42 | |
| parent | ac12c5f882b91b7693a950ca499a85925a0fe372 (diff) | |
| download | nginx-ef03533f89435d9490e3bc3c6fa13a3720339e0a.tar.gz nginx-ef03533f89435d9490e3bc3c6fa13a3720339e0a.tar.bz2 | |
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.
| -rw-r--r-- | src/os/unix/ngx_freebsd_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |