aboutsummaryrefslogtreecommitdiff
path: root/contrib/llvm-project/clang/lib/Lex/TokenLexer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/llvm-project/clang/lib/Lex/TokenLexer.cpp')
-rw-r--r--contrib/llvm-project/clang/lib/Lex/TokenLexer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/llvm-project/clang/lib/Lex/TokenLexer.cpp b/contrib/llvm-project/clang/lib/Lex/TokenLexer.cpp
index da5681aaf478..97cb2cf0bb8c 100644
--- a/contrib/llvm-project/clang/lib/Lex/TokenLexer.cpp
+++ b/contrib/llvm-project/clang/lib/Lex/TokenLexer.cpp
@@ -148,12 +148,12 @@ bool TokenLexer::MaybeRemoveCommaBeforeVaArgs(
return false;
// GCC removes the comma in the expansion of " ... , ## __VA_ARGS__ " if
- // __VA_ARGS__ is empty, but not in strict C99 mode where there are no
- // named arguments, where it remains. In all other modes, including C99
- // with GNU extensions, it is removed regardless of named arguments.
+ // __VA_ARGS__ is empty, but not in strict mode where there are no
+ // named arguments, where it remains. With GNU extensions, it is removed
+ // regardless of named arguments.
// Microsoft also appears to support this extension, unofficially.
- if (PP.getLangOpts().C99 && !PP.getLangOpts().GNUMode
- && Macro->getNumParams() < 2)
+ if (!PP.getLangOpts().GNUMode && !PP.getLangOpts().MSVCCompat &&
+ Macro->getNumParams() < 2)
return false;
// Is a comma available to be removed?