diff options
| author | José Fonseca <jfonseca@vmware.com> | 2012-10-10 11:35:34 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2012-10-10 11:35:34 +0100 |
| commit | a5558881519dc424abc25926d5a44ddfff06a993 (patch) | |
| tree | de3abf7cf11b58af0c0b1e58a2990f6c6d623602 /src/mesa/main/imports.c | |
| parent | 9c1c23331a1238ab8de4b2cd0e4c6a2f76772aed (diff) | |
| download | external_mesa3d-a5558881519dc424abc25926d5a44ddfff06a993.zip external_mesa3d-a5558881519dc424abc25926d5a44ddfff06a993.tar.gz external_mesa3d-a5558881519dc424abc25926d5a44ddfff06a993.tar.bz2 | |
mesa: Silence 'assignment makes integer from pointer without a cast' warnings.
Diffstat (limited to 'src/mesa/main/imports.c')
| -rw-r--r-- | 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; |