diff options
author | Reid Kleckner <reid@kleckner.net> | 2013-04-19 17:00:14 +0000 |
---|---|---|
committer | Reid Kleckner <reid@kleckner.net> | 2013-04-19 17:00:14 +0000 |
commit | f0cdc84298103e57919674bd1781624c74ab76d3 (patch) | |
tree | afaafc525b7cdc92911a25b70b65167ce9bff940 /test/Modules | |
parent | b80a16eadd0dacabfc1c32412e243ccb99dd664d (diff) |
Avoid names like __in that conflict with SAL in builtin headers
Microsoft's Source Annotation Language (SAL) defines a bunch of keywords
for annotating the inputs and outputs of functions. Empty definitions
for the keywords are provided by <stdlib.h> -> <crtdefs.h> -> <sal.h>.
This makes it basically impossible to include MSVC's stdlib.h and
Clang's *mmintrin.h headers at the same time if they have variables
named __in. As a workaround, I've renamed those variables.
This fixes the Modules/compiler_builtins.m test which was XFAILed,
presumably due to this conflict.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@179860 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Modules')
-rw-r--r-- | test/Modules/compiler_builtins.m | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/Modules/compiler_builtins.m b/test/Modules/compiler_builtins.m index 5ea7d795c7..4b8cb5bdc5 100644 --- a/test/Modules/compiler_builtins.m +++ b/test/Modules/compiler_builtins.m @@ -2,7 +2,6 @@ // RUN: %clang -fsyntax-only -fmodules -fmodules-cache-path=%t -D__need_wint_t %s -Xclang -verify // RUN: %clang -fsyntax-only -std=c99 -fmodules -fmodules-cache-path=%t -D__need_wint_t %s -Xclang -verify // expected-no-diagnostics -// XFAIL: win32 #ifdef __SSE__ @import _Builtin_intrinsics.intel.sse; |