diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-11-27 20:47:55 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-11-27 20:47:55 +0000 |
| commit | 2f899aa56ca05acff094a3ebd1aa99665eee0c7a (patch) | |
| tree | 1b8ef8a3ffb33ebe1fa559a10d3390c79a1451f8 /src | |
| parent | a8c54c082cfe3dfaeca89f07a0cebd7b92fba28b (diff) | |
| download | nginx-2f899aa56ca05acff094a3ebd1aa99665eee0c7a.tar.gz nginx-2f899aa56ca05acff094a3ebd1aa99665eee0c7a.zip | |
fix building on 64-bit platforms
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_slab.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c index e182b7a1a..763a1d6e4 100644 --- a/src/core/ngx_slab.c +++ b/src/core/ngx_slab.c @@ -149,8 +149,8 @@ void * ngx_slab_alloc(ngx_slab_pool_t *pool, size_t size) { size_t s; - uintptr_t p, mask, *bitmap; - ngx_uint_t i, n, m, slot, shift, map; + uintptr_t p, n, m, mask, *bitmap; + ngx_uint_t i, slot, shift, map; ngx_slab_page_t *page, *prev, *slots; ngx_shmtx_lock(&pool->mutex); @@ -287,7 +287,7 @@ ngx_slab_alloc(ngx_slab_pool_t *pool, size_t size) do { if ((page->slab & NGX_SLAB_MAP_MASK) != mask) { - for (m = 1 << NGX_SLAB_MAP_SHIFT, i = 0; + for (m = (uintptr_t) 1 << NGX_SLAB_MAP_SHIFT, i = 0; m & mask; m <<= 1, i++) { @@ -369,7 +369,7 @@ ngx_slab_alloc(ngx_slab_pool_t *pool, size_t size) } else { /* size < ngx_pagesize */ - page->slab = (1 << NGX_SLAB_MAP_SHIFT) | shift; + page->slab = ((uintptr_t) 1 << NGX_SLAB_MAP_SHIFT) | shift; page->next = &slots[slot]; page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_BIG; |