Merge branch 'privatestaging' of https://github.com/AMDComputeLibraries/HIP-privatestaging into privatestaging

include/hcc_detail/hip_hcc.h

@@ -219,9 +219,9 @@ extern "C" {
 #endif
 
 typedef class ihipStream_t* hipStream_t;
-typedef struct hipEvent_t {
-    struct ihipEvent_t *_handle;
-} hipEvent_t;
+//typedef struct hipEvent_t {
+//    struct ihipEvent_t *_handle;
+//} hipEvent_t;
 
 #ifdef __cplusplus
 }

include/hcc_detail/hip_runtime_api.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 
 #include <hcc_detail/host_defines.h>
 #include <hip_runtime_api.h>
-#include "hip_hcc.h"
+//#include "hip_hcc.h"
 
 #if defined (__HCC__) &&  (__hcc_workweek__ < 16074)
 #error("This version of HIP requires a newer version of HCC.");
@@ -42,6 +42,12 @@ THE SOFTWARE.
 extern "C" {
 #endif
 
+typedef struct ihipStream_t *hipStream_t;
+typedef struct hipEvent_t {
+    struct ihipEvent_t *_handle;
+} hipEvent_t;
+
+
 /**
  * @addtogroup GlobalDefs More
  * @{