cppparser: Fix recursion in expanding function macro arguments

See #1635
panda3d · Mar 27, 2024 · 38a3048 · 38a3048
1 parent c923cf6
commit 38a3048
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/dtool/src/cppparser/cppPreprocessor.cxx b/dtool/src/cppparser/cppPreprocessor.cxx
@@ -2184,6 +2184,11 @@ expand_manifest(const CPPManifest *manifest, const YYLTYPE &loc) {
   for (string &arg : args) {
     std::set<const CPPManifest *> expanded;
     expanded.insert(manifest);
+    for (const InputFile &infile : _files) {
+      if (infile._ignore_manifest) {
+        expanded.insert(infile._manifest);
+      }
+    }
     r_expand_manifests(arg, false, loc, expanded);
   }