OSDN Git Service

r300: Silence 'mixed declarations and code' warning.
authorVinson Lee <vlee@vmware.com>
Mon, 4 Jan 2010 02:32:07 +0000 (18:32 -0800)
committerVinson Lee <vlee@vmware.com>
Mon, 4 Jan 2010 02:32:07 +0000 (18:32 -0800)
src/mesa/drivers/dri/r300/compiler/memory_pool.c

index 37aa2b6..76c7c60 100644 (file)
@@ -71,12 +71,14 @@ static void refill_pool(struct memory_pool * pool)
 void * memory_pool_malloc(struct memory_pool * pool, unsigned int bytes)
 {
        if (bytes < POOL_LARGE_ALLOC) {
+               void * ptr;
+
                if (pool->head + bytes > pool->end)
                        refill_pool(pool);
 
                assert(pool->head + bytes <= pool->end);
 
-               void * ptr = pool->head;
+               ptr = pool->head;
 
                pool->head += bytes;
                pool->head = (unsigned char*)(((unsigned long)pool->head + POOL_ALIGN - 1) & ~(POOL_ALIGN - 1));