Reduced the number of preprocessor directives.

This commit is contained in:
Ruslan Ermilov 2012-07-26 14:47:42 +00:00
parent cfe194ef59
commit 01f07bde7e

View File

@ -45,9 +45,7 @@
#define ngx_slab_junk(p, size) ngx_memset(p, 0xA5, size) #define ngx_slab_junk(p, size) ngx_memset(p, 0xA5, size)
#else #elif (NGX_HAVE_DEBUG_MALLOC)
#if (NGX_HAVE_DEBUG_MALLOC)
#define ngx_slab_junk(p, size) \ #define ngx_slab_junk(p, size) \
if (ngx_debug_malloc) ngx_memset(p, 0xA5, size) if (ngx_debug_malloc) ngx_memset(p, 0xA5, size)
@ -58,8 +56,6 @@
#endif #endif
#endif
static ngx_slab_page_t *ngx_slab_alloc_pages(ngx_slab_pool_t *pool, static ngx_slab_page_t *ngx_slab_alloc_pages(ngx_slab_pool_t *pool,
ngx_uint_t pages); ngx_uint_t pages);
static void ngx_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page, static void ngx_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,