summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/imports.c
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2015-01-07 14:27:12 +0000
committerJosé Fonseca <[email protected]>2015-01-08 18:57:04 +0000
commit0dba2af2fbea78a937a4402f711dc4cea5189966 (patch)
treec8d31aef52647c2b81da5d316a5ee8ec082505c7 /src/mesa/main/imports.c
parent0ac4c272755c75108a10a84ce33bf6a6234985d3 (diff)
mesa: Address `assignment makes integer from pointer without a cast` gcc warning.
Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/main/imports.c')
-rw-r--r--src/mesa/main/imports.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 6945c2f621b..4f5a2d11fa9 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -94,7 +94,7 @@ _mesa_align_malloc(size_t bytes, unsigned long alignment)
ASSERT( alignment > 0 );
- ptr = malloc(bytes + alignment + sizeof(void *));
+ ptr = (uintptr_t)malloc(bytes + alignment + sizeof(void *));
if (!ptr)
return NULL;
@@ -143,7 +143,7 @@ _mesa_align_calloc(size_t bytes, unsigned long alignment)
ASSERT( alignment > 0 );
- ptr = calloc(1, bytes + alignment + sizeof(void *));
+ ptr = (uintptr_t)calloc(1, bytes + alignment + sizeof(void *));
if (!ptr)
return NULL;