Mesa (master): mesa: Address `assignment makes integer from pointer without a cast` gcc warning.

[Jose Fonseca]

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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Jan  7 14:27:12 2015 +0000

mesa: Address `assignment makes integer from pointer without a cast` gcc warning.

Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

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

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 6945c2f..4f5a2d1 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;