ac: resolve conflicts introduced with "ac: remove amdgpu.h dependency"
authorEmil Velikov <emil.velikov@collabora.com>
Fri, 16 Jun 2017 18:10:25 +0000 (19:10 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Sat, 17 Jun 2017 10:37:51 +0000 (11:37 +0100)
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 <mark.a.janes@intel.com>
Cc: Gregor Münch <gr.muench@gmail.com>
Reported-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reported-by: Mark Janes <mark.a.janes@intel.com>
Reported-by: Gregor Münch <gr.muench@gmail.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tested-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
src/amd/common/ac_gpu_info.h

index a72ab58f9a32fc1004ef6452d196fe6d2fca7d57..3091fed6a434fa34c05133721a579e0b6ebd0645 100644 (file)
@@ -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 {