Index: clang/lib/Headers/opencl-c-base.h =================================================================== --- clang/lib/Headers/opencl-c-base.h +++ clang/lib/Headers/opencl-c-base.h @@ -164,9 +164,7 @@ typedef double double16 __attribute__((ext_vector_type(16))); #endif -#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) #define NULL ((void*)0) -#endif /** * Value of maximum non-infinite single-precision floating-point Index: clang/test/SemaOpenCL/null_literal.cl =================================================================== --- clang/test/SemaOpenCL/null_literal.cl +++ clang/test/SemaOpenCL/null_literal.cl @@ -1,7 +1,8 @@ -// RUN: %clang_cc1 -verify %s -// RUN: %clang_cc1 -cl-std=CL2.0 -DCL20 -verify %s - -#define NULL ((void*)0) +// RUN: %clang_cc1 -fdeclare-opencl-builtins -finclude-default-header -verify %s +// RUN: %clang_cc1 -cl-std=CL1.0 -fdeclare-opencl-builtins -finclude-default-header -verify %s +// RUN: %clang_cc1 -cl-std=CL1.1 -fdeclare-opencl-builtins -finclude-default-header -verify %s +// RUN: %clang_cc1 -cl-std=CL1.2 -fdeclare-opencl-builtins -finclude-default-header -verify %s +// RUN: %clang_cc1 -cl-std=CL2.0 -DCL20 -fdeclare-opencl-builtins -finclude-default-header -verify %s void foo(){