diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-08-06 17:15:23 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-08-06 17:15:23 +0000 |
| commit | 23778a20c98d93353da69aba08ee76772f257c34 (patch) | |
| tree | c20e0987fbf25a405bbd9a6f51e43b6be52105d6 | |
| parent | f3959db1e773a7d5fef3009f04b1afb2c2d4c744 (diff) | |
| download | nginx-23778a20c98d93353da69aba08ee76772f257c34.tar.gz nginx-23778a20c98d93353da69aba08ee76772f257c34.zip | |
Merge of r4765: reduced the number of preprocessor directives.
| -rw-r--r-- | src/core/ngx_slab.c | 6 |
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, |