Module: Mesa Branch: master Commit: 7df75203052fa8a8f2fbd603a4c7553752c57b0f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7df75203052fa8a8f2fbd603a4c7553752c57b0f
Author: Vinson Lee <[email protected]> Date: Fri Mar 27 19:56:10 2020 -0700 mesa: Change _mesa_exec_malloc argument type. Fix build error. In file included from ../src/mesa/x86/rtasm/x86sse.c:7:0: ../src/mesa/main/execmem.h:31:19: error: unknown type name ‘GLuint’; did you mean ‘uint’? _mesa_exec_malloc(GLuint size); ^~~~~~ uint Suggested-by: Marek Olšák <[email protected]> Fixes: e5339fe4a47c ("Move compiler.h and imports.h/c from src/mesa/main into src/util") Signed-off-by: Vinson Lee <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4361> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4361> --- src/mesa/main/execmem.c | 4 ++-- src/mesa/main/execmem.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c index 3b08f42a3dd..37a043a0b3a 100644 --- a/src/mesa/main/execmem.c +++ b/src/mesa/main/execmem.c @@ -90,7 +90,7 @@ init_heap(void) void * -_mesa_exec_malloc(GLuint size) +_mesa_exec_malloc(unsigned size) { struct mem_block *block = NULL; void *addr = NULL; @@ -140,7 +140,7 @@ _mesa_exec_free(void *addr) */ void * -_mesa_exec_malloc(GLuint size) +_mesa_exec_malloc(unsigned size) { return malloc( size ); } diff --git a/src/mesa/main/execmem.h b/src/mesa/main/execmem.h index bc51a8c8411..f9479b96379 100644 --- a/src/mesa/main/execmem.h +++ b/src/mesa/main/execmem.h @@ -28,7 +28,7 @@ extern void * -_mesa_exec_malloc(GLuint size); +_mesa_exec_malloc(unsigned size); extern void _mesa_exec_free(void *addr); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
