address review comments

KhronosGroup · Oct 9, 2024 · 1cfcbfe · 1cfcbfe
1 parent a0264ac
commit 1cfcbfe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 26 deletions.
diff --git a/test_common/harness/msvc9.c b/test_common/harness/msvc9.c
@@ -714,6 +714,10 @@ int32_t float2int(float fx)
     return u.i;
 }
 
+#ifndef __has_builtin
+#define __has_builtin(x) 0
+#endif
+
 #if !__has_builtin(__builtin_clz)
 #if !defined(_WIN64)
 /** Returns the number of leading 0-bits in x,

diff --git a/test_conformance/events/test_userevents.cpp b/test_conformance/events/test_userevents.cpp
@@ -28,31 +28,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // CL error checking.
 
-#if defined(_MSC_VER)
-#if defined(__INTEL_LLVM_COMPILER)
-#define CL_EXIT_ERROR(cmd, ...)                                                \
-    {                                                                          \
-        if ((cmd) != CL_SUCCESS)                                               \
-        {                                                                      \
-            log_error("CL ERROR: %s %u: ", __FILE__, __LINE__);                \
-            log_error(__VA_ARGS__);                                            \
-            log_error("\n");                                                   \
-            return -1;                                                         \
-        }                                                                      \
-    }
-#else
-#define CL_EXIT_ERROR(cmd, ...)                                                \
-    {                                                                          \
-        if ((cmd) != CL_SUCCESS)                                               \
-        {                                                                      \
-            log_error("CL ERROR: %s %u: ", __FILE__, __LINE__);                \
-            log_error(##__VA_ARGS__);                                          \
-            log_error("\n");                                                   \
-            return -1;                                                         \
-        }                                                                      \
-    }
-#endif
-#else
 #define CL_EXIT_ERROR(cmd, format, ...)                                        \
     {                                                                          \
         if ((cmd) != CL_SUCCESS)                                               \
@@ -63,7 +38,6 @@
             return -1;                                                         \
         }                                                                      \
     }
-#endif
 
 #define CL_EXIT_BUILD_ERROR(cmd, program, format, ...)                         \
     {                                                                          \