From 84bf7e5ad6f496aff75b10c305259bf89bace38f Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 16 Jun 2017 19:10:25 +0100 Subject: ac: resolve conflicts introduced with "ac: remove amdgpu.h dependency" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Cc: Gregor Münch Reported-by: Bas Nieuwenhuizen Reported-by: Mark Janes Reported-by: Gregor Münch Signed-off-by: Emil Velikov Reviewed-by: Bas Nieuwenhuizen Tested-by: Bas Nieuwenhuizen --- src/amd/common/ac_gpu_info.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/amd') diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index a72ab58f9a3..3091fed6a43 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 +#include #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 { -- cgit v1.2.3