commit 2f899aa56ca05acff094a3ebd1aa99665eee0c7a
author Igor Sysoev <igor@sysoev.ru> Mon Nov 27 20:47:55 2006 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Nov 27 20:47:55 2006 +0000
tree 1b8ef8a3ffb33ebe1fa559a10d3390c79a1451f8
parent a8c54c082cfe3dfaeca89f07a0cebd7b92fba28b

fix building on 64-bit platforms

src/core/ngx_slab.c

diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c
index e182b7a..763a1d6 100644
--- a/src/core/ngx_slab.c
+++ b/src/core/ngx_slab.c
@@ -149,8 +149,8 @@
 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 @@
             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 @@
 
         } 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;