From 23778a20c98d93353da69aba08ee76772f257c34 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 6 Aug 2012 17:15:23 +0000 Subject: Merge of r4765: reduced the number of preprocessor directives. --- src/core/ngx_slab.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c index 3d5660377..782792d79 100644 --- a/src/core/ngx_slab.c +++ b/src/core/ngx_slab.c @@ -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, -- cgit