[nginx] svn commit: r4765 - trunk/src/core

[ru at nginx.com]

Author: ru
Date: 2012-07-26 14:47:42 +0000 (Thu, 26 Jul 2012)
New Revision: 4765
URL: http://trac.nginx.org/nginx/changeset/4765/nginx

Log:
Reduced the number of preprocessor directives.


Modified:
   trunk/src/core/ngx_slab.c

Modified: trunk/src/core/ngx_slab.c
===================================================================
--- trunk/src/core/ngx_slab.c	2012-07-24 17:40:06 UTC (rev 4764)
+++ trunk/src/core/ngx_slab.c	2012-07-26 14:47:42 UTC (rev 4765)
@@ -45,10 +45,8 @@
 
 #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)                                                \
     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,