summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2017-06-16 19:10:25 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2017-06-17 11:37:51 +0100
commit84bf7e5ad6f496aff75b10c305259bf89bace38f (patch)
treea2bace4d75209d8b3e1a69f4a746b3cded6b8b01
parent69672859814f36e9b8756b8f1c4655c49b9f6f4f (diff)
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 <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>
-rw-r--r--src/amd/common/ac_gpu_info.h4
1 files changed, 3 insertions, 1 deletions
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 <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 {