Fix #14317 Syntax error using macro inside ifdef block

ceJce · ceJce · commit eb9075c65f9a · 2026-01-14T16:08:30.000+01:00
diff --git a/externals/simplecpp/simplecpp.cpp b/externals/simplecpp/simplecpp.cpp
@@ -3339,7 +3339,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
         if (dui.undefined.find(macroname) != dui.undefined.end())
             continue;
         const std::string lhs(macrostr.substr(0,eq));
-        const std::string rhs(eq==std::string::npos ? std::string("1") : macrostr.substr(eq+1));
+        const std::string rhs(eq == std::string::npos ? lhs : macrostr.substr(eq + 1));
         const Macro macro(lhs, rhs, dummy);
         macros.insert(std::pair<TokenString,Macro>(macro.name(), macro));
     }

Original file line number	Diff line number	Diff line change
`@@ -3339,7 +3339,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL`
`3339`	`3339`	`if (dui.undefined.find(macroname) != dui.undefined.end())`
`3340`	`3340`	`continue;`
`3341`	`3341`	`const std::string lhs(macrostr.substr(0,eq));`
`3342`		`- const std::string rhs(eq==std::string::npos ? std::string("1") : macrostr.substr(eq+1));`
	`3342`	`+ const std::string rhs(eq == std::string::npos ? lhs : macrostr.substr(eq + 1));`
`3343`	`3343`	`const Macro macro(lhs, rhs, dummy);`
`3344`	`3344`	`macros.insert(std::pair<TokenString,Macro>(macro.name(), macro));`
`3345`	`3345`	`}`