From 36af9b64500cfc995ac152f4aa902e85d332ad90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Fri, 2 Jun 2023 17:52:13 +0200 Subject: [PATCH] simplecpp: Bump latest changes. Fixes #9754 (#5111) --- externals/simplecpp/simplecpp.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/externals/simplecpp/simplecpp.cpp b/externals/simplecpp/simplecpp.cpp index 3ef91d599..77c80fa5a 100644 --- a/externals/simplecpp/simplecpp.cpp +++ b/externals/simplecpp/simplecpp.cpp @@ -1925,8 +1925,12 @@ namespace simplecpp { // Macro parameter.. { TokenList temp(files); - if (expandArg(&temp, tok, loc, macros, expandedmacros, parametertokens)) + if (expandArg(&temp, tok, loc, macros, expandedmacros, parametertokens)) { + if (tok->str() == "__VA_ARGS__" && temp.empty() && output->cback() && output->cback()->str() == "," && + tok->nextSkipComments() && tok->nextSkipComments()->str() == ")") + output->deleteToken(output->back()); return recursiveExpandToken(output, temp, loc, tok, macros, expandedmacros, parametertokens); + } } // Macro..