From 9be07e1acd9d400f5b86d0251121d6122ffbc0e9 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Mon, 30 Jun 2014 20:36:33 +0000 Subject: [PATCH] Do not define __STRICT_ANSI__ in clang-cl llvm-svn: 212066 --- clang/lib/Frontend/InitPreprocessor.cpp | 2 +- clang/test/Preprocessor/predefined-macros.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index 8aa96d8..7709939 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -478,7 +478,7 @@ static void InitializePredefinedMacros(const TargetInfo &TI, // Initialize language-specific preprocessor defines. // Standard conforming mode? - if (!LangOpts.GNUMode) + if (!LangOpts.GNUMode && !LangOpts.MSVCCompat) Builder.defineMacro("__STRICT_ANSI__"); if (LangOpts.CPlusPlus11) diff --git a/clang/test/Preprocessor/predefined-macros.c b/clang/test/Preprocessor/predefined-macros.c index 34de794..3e0b8a0 100644 --- a/clang/test/Preprocessor/predefined-macros.c +++ b/clang/test/Preprocessor/predefined-macros.c @@ -9,6 +9,7 @@ // CHECK-MS: #define _M_IX86_FP // CHECK-MS: #define _WIN32 1 // CHECK-MS-NOT: #define __GNUC__ +// CHECK-MS-NOT: #define __STRICT_ANSI__ // // RUN: %clang_cc1 %s -E -dM -triple i686-pc-win32 -fms-compatibility \ // RUN: -o - | FileCheck %s --check-prefix=CHECK-MS-STDINT -- 2.7.4