IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-01-08 07:03:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix building on 64-bit platforms

Browse Source
This commit is contained in:
Igor Sysoev 2006-11-27 20:47:55 +00:00
parent a8c54c082c
commit 2f899aa56c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/ngx_slab.c
View File

@ -149,8 +149,8 @@ void *
ngx_slab_alloc(ngx_slab_pool_t *pool, size_t size) ngx_slab_alloc(ngx_slab_pool_t *pool, size_t size)
{ {
size_t s; size_t s;
uintptr_t p, mask, *bitmap; uintptr_t p, n, m, mask, *bitmap;
ngx_uint_t i, n, m, slot, shift, map; ngx_uint_t i, slot, shift, map;
ngx_slab_page_t *page, *prev, *slots; ngx_slab_page_t *page, *prev, *slots;
ngx_shmtx_lock(&pool->mutex); ngx_shmtx_lock(&pool->mutex);
@ -287,7 +287,7 @@ ngx_slab_alloc(ngx_slab_pool_t *pool, size_t size)
do { do {
if ((page->slab & NGX_SLAB_MAP_MASK) != mask) { 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 & mask;
m <<= 1, i++) m <<= 1, i++)
{ {
@ -369,7 +369,7 @@ ngx_slab_alloc(ngx_slab_pool_t *pool, size_t size)
} else { /* size < ngx_pagesize */ } 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->next = &slots[slot];
page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_BIG; page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_BIG;