Author: mdounin
Date: 2012-08-06 17:15:23 +0000 (Mon, 06 Aug 2012)
New Revision: 4802
URL: http://trac.nginx.org/nginx/changeset/4802/nginx

Log:
Merge of r4765: reduced the number of preprocessor directives.


Modified:
branches/stable-1.2/
branches/stable-1.2/src/core/ngx_slab.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2012-08-06 17:13:20 UTC (rev 4801)
+++ branches/stable-1.2 2012-08-06 17:15:23 UTC (rev 4802)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754,4756-4764,4768
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754,4756-4765,4768
\ No newline at end of property
Modified: branches/stable-1.2/src/core/ngx_slab.c
===================================================================
--- branches/stable-1.2/src/core/ngx_slab.c 2012-08-06 17:13:20 UTC (rev 4801)
+++ branches/stable-1.2/src/core/ngx_slab.c 2012-08-06 17:15:23 UTC (rev 4802)
@@ -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,

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel