Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2012-07-26 18:47:42 +0400
committerRuslan Ermilov <ru@nginx.com>2012-07-26 18:47:42 +0400
commit01f07bde7ea9cdc683864fe49d83d36cffa2caac (patch)
tree7b1f65ee2171dc4495c0499f183b82b0a34bbee3 /src/core/ngx_slab.c
parentcfe194ef594f2c48f35128e20696c0b5db573f84 (diff)
Reduced the number of preprocessor directives.
Diffstat (limited to 'src/core/ngx_slab.c')
-rw-r--r--src/core/ngx_slab.c6
1 files changed, 1 insertions, 5 deletions
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,