diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-11 08:30:47 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-11 08:30:47 +0200 |
| commit | 8223fb176264123c86c0d3eb845973d00fd62cc2 (patch) | |
| tree | 1e6e73574f4025c542347d1fe023684619b65698 /mesalib/src/mesa/main/imports.c | |
| parent | 8c5587d9be904856f7e449a144c2819a8e310599 (diff) | |
| download | vcxsrv-8223fb176264123c86c0d3eb845973d00fd62cc2.tar.gz vcxsrv-8223fb176264123c86c0d3eb845973d00fd62cc2.tar.bz2 vcxsrv-8223fb176264123c86c0d3eb845973d00fd62cc2.zip | |
xwininfo mesa git update 11 oct 2012
xwininfo: f7b55bdf674fc790e879a2e25ef83925dd8379d6
mesa: 34c58acb59bc0b827e28ef9e89044621ab0b3ee1
Diffstat (limited to 'mesalib/src/mesa/main/imports.c')
| -rw-r--r-- | mesalib/src/mesa/main/imports.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c index 934a2d05f..ed324b588 100644 --- a/mesalib/src/mesa/main/imports.c +++ b/mesalib/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; |