Merge pull request #1527 from emankov/doc

[HIP][fix] Prefix libraryPropertyType to fix build of rocFFT and TensorFlow

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
-

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
 
+// hipLibraryPropertyType
+#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