Merge branch 'amd-master' into amd-develop

[ROCm/hip commit: d7b040bdba]

projects/hip/include/hcc_detail/hip_runtime.h

@@ -37,9 +37,8 @@ THE SOFTWARE.
 #include <string.h>
 #include <stddef.h>
 
-
-
-
+// Define NVCC_COMPAT for CUDA compatibility
+#define NVCC_COMPAT
 #define CUDA_SUCCESS hipSuccess
 
 #include <hip/hip_runtime_api.h>