From 3a83b3a62cd3ae05554db7cdd2fb7ed173aeb5bf Mon Sep 17 00:00:00 2001
From: Evgeny Mankov <evgeny.mankov@gmail.com>
Date: Fri, 11 Oct 2019 15:18:08 +0300
Subject: [PATCH] [HIP][fix] Prefix libraryPropertyType to fix build of rocFFT
 and TensorFlow

---
 hipamd/include/hip/hcc_detail/library_types.h    | 11 +++++------
 hipamd/include/hip/nvcc_detail/hip_runtime_api.h |  6 ++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/hipamd/include/hip/hcc_detail/library_types.h b/hipamd/include/hip/hcc_detail/library_types.h
index 74bae81321..6fcd0dc3d1 100644
--- a/hipamd/include/hip/hcc_detail/library_types.h
+++ b/hipamd/include/hip/hcc_detail/library_types.h
@@ -32,11 +32,10 @@ typedef enum hipDataType {
   HIP_C_64F = 5
 } hipDataType;
 
-typedef enum libraryPropertyType {
-  MAJOR_VERSION,
-  MINOR_VERSION,
-  PATCH_LEVEL
-} libraryPropertyType;
+typedef enum hipLibraryPropertyType {
+  HIP_LIBRARY_MAJOR_VERSION,
+  HIP_LIBRARY_MINOR_VERSION,
+  HIP_LIBRARY_PATCH_LEVEL
+} hipLibraryPropertyType;
 
 #endif
-
diff --git a/hipamd/include/hip/nvcc_detail/hip_runtime_api.h b/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
index 02f83b329e..3d17f1d867 100644
--- a/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
+++ b/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
@@ -59,6 +59,12 @@ typedef enum hipMemcpyKind {
 #define HIP_C_32F CUDA_C_32F
 #define HIP_C_64F CUDA_C_64F
 
+// hipDataType
+#define hipLibraryPropertyType libraryPropertyType
+#define HIP_LIBRARY_MAJOR_VERSION MAJOR_VERSION
+#define HIP_LIBRARY_MINOR_VERSION MINOR_VERSION
+#define HIP_LIBRARY_PATCH_LEVEL PATCH_LEVEL
+
 // hipTextureAddressMode
 #define hipTextureAddressMode cudaTextureAddressMode
 #define hipAddressModeWrap cudaAddressModeWrap