Mercurial > hg > nginx

comparison src/core/ngx_slab.c @ 4801:8f2f71233f5b stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4765: reduced the number of preprocessor directives.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 06 Aug 2012 17:15:23 +0000
parents d620f497c50f
children 40de49cf6b37
comparison
equal deleted inserted replaced
4800:5ce5b3c81979 4801:8f2f71233f5b
43 43
44 #if (NGX_DEBUG_MALLOC) 44 #if (NGX_DEBUG_MALLOC)
45 45
46 #define ngx_slab_junk(p, size) ngx_memset(p, 0xA5, size) 46 #define ngx_slab_junk(p, size) ngx_memset(p, 0xA5, size)
47 47
48 #else 48 #elif (NGX_HAVE_DEBUG_MALLOC)
49
50 #if (NGX_HAVE_DEBUG_MALLOC)
51 49
52 #define ngx_slab_junk(p, size) \ 50 #define ngx_slab_junk(p, size) \
53 if (ngx_debug_malloc) ngx_memset(p, 0xA5, size) 51 if (ngx_debug_malloc) ngx_memset(p, 0xA5, size)
54 52
55 #else 53 #else
56 54
57 #define ngx_slab_junk(p, size) 55 #define ngx_slab_junk(p, size)
58
59 #endif
60 56
61 #endif 57 #endif
62 58
63 static ngx_slab_page_t *ngx_slab_alloc_pages(ngx_slab_pool_t *pool, 59 static ngx_slab_page_t *ngx_slab_alloc_pages(ngx_slab_pool_t *pool,
64 ngx_uint_t pages); 60 ngx_uint_t pages);