Mercurial > hg > nginx
changeset 4801:8f2f71233f5b stable-1.2
Merge of r4765: reduced the number of preprocessor directives.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 06 Aug 2012 17:15:23 +0000 |
parents | 5ce5b3c81979 |
children | 6fc86fe0b586 |
files | src/core/ngx_slab.c |
diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_slab.c Mon Aug 06 17:13:20 2012 +0000 +++ b/src/core/ngx_slab.c Mon Aug 06 17:15:23 2012 +0000 @@ -45,9 +45,7 @@ #define ngx_slab_junk(p, size) ngx_memset(p, 0xA5, size) -#else - -#if (NGX_HAVE_DEBUG_MALLOC) +#elif (NGX_HAVE_DEBUG_MALLOC) #define ngx_slab_junk(p, size) \ if (ngx_debug_malloc) ngx_memset(p, 0xA5, size) @@ -58,8 +56,6 @@ #endif -#endif - static ngx_slab_page_t *ngx_slab_alloc_pages(ngx_slab_pool_t *pool, ngx_uint_t pages); static void ngx_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,