Mesa (master): mesa: Silence ' assignment makes integer from pointer without a cast' warnings.

[Jose Fonseca]

Module: Mesa
Branch: master
Commit: a5558881519dc424abc25926d5a44ddfff06a993
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5558881519dc424abc25926d5a44ddfff06a993

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Oct 10 11:35:34 2012 +0100

mesa: Silence 'assignment makes integer from pointer without a cast' warnings.

---

 src/mesa/main/imports.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 934a2d0..ed324b5 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;