Merge of r4765: reduced the number of preprocessor directives.

This commit is contained in:
Maxim Dounin 2012-08-06 17:15:23 +00:00
parent 726a071b0f
commit af87c31654
1 changed files with 1 additions and 5 deletions

View File

@ -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,