summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2012-10-10 11:35:34 +0100
committerJosé Fonseca <[email protected]>2012-10-10 11:35:34 +0100
commita5558881519dc424abc25926d5a44ddfff06a993 (patch)
treede3abf7cf11b58af0c0b1e58a2990f6c6d623602 /src/mesa/main
parent9c1c23331a1238ab8de4b2cd0e4c6a2f76772aed (diff)
mesa: Silence 'assignment makes integer from pointer without a cast' warnings.
Diffstat (limited to 'src/mesa/main')
-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 934a2d05f75..ed324b588df 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -97,7 +97,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;
@@ -146,7 +146,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;