Module: Mesa Branch: master Commit: 84bf7e5ad6f496aff75b10c305259bf89bace38f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=84bf7e5ad6f496aff75b10c305259bf89bace38f
Author: Emil Velikov <[email protected]> Date: Fri Jun 16 19:10:25 2017 +0100 ac: resolve conflicts introduced with "ac: remove amdgpu.h dependency" The commit did not add the relevant includes - in particular stdint.h and stdbool.h for the respective standard types. At the same time, the amdgpu_device_handle typedef redeclaration was off. Fixes: 81945ded0dc ("ac: remove amdgpu.h dependency") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101471 Cc: Mark Janes <[email protected]> Cc: Gregor Münch <[email protected]> Reported-by: Bas Nieuwenhuizen <[email protected]> Reported-by: Mark Janes <[email protected]> Reported-by: Gregor Münch <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Tested-by: Bas Nieuwenhuizen <[email protected]> --- src/amd/common/ac_gpu_info.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index a72ab58f9a..3091fed6a4 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -26,6 +26,8 @@ #ifndef AC_GPU_INFO_H #define AC_GPU_INFO_H +#include <stdint.h> +#include <stdbool.h> #include "amd_family.h" #ifdef __cplusplus @@ -33,7 +35,7 @@ extern "C" { #endif /* Prior to C11 the following may trigger a typedef redeclaration warning */ -typedef void * amdgpu_device_handle; +typedef struct amdgpu_device *amdgpu_device_handle; struct amdgpu_gpu_info; struct radeon_info { _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
