Merge pull request #365 from lmoriche/master

__CUDA__ and __HIP__ are both defined when compiling with 'clang -x h…

[ROCm/clr commit: c9903c7295]

projects/clr/hipamd/include/hip/hip_common.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #endif //__HCC__
 
 // Auto enable __HIP_PLATFORM_NVCC__ if compiling with NVCC
-#if defined(__NVCC__) || (defined(__clang__) && defined(__CUDA__))
+#if defined(__NVCC__) || (defined(__clang__) && defined(__CUDA__) && !defined(__HIP__))
 #define __HIP_PLATFORM_NVCC__
 #ifdef __CUDACC__
 #define __HIPCC__