Drop static ifs before macro translations to avoid compiler issues

source/dpp/translation/macro_.d

@@ -74,15 +74,16 @@ string[] translateMacro(in from!"clang".Cursor cursor,
                 ];
             }
         }
+
         return [
             `#ifdef ` ~ spelling,
             `#    undef ` ~ spelling,
             `#endif`,
-            `static if(!is(typeof(` ~ spelling ~ `))) {`,
-            ] ~ ret ~ [
-            `}`,
-            `#define ` ~ spelling ~ ` ` ~ translation.dcode,
-        ];
+            ] ~
+            ret ~
+            [
+                `#define ` ~ spelling ~ ` ` ~ translation.dcode,
+            ];
     }
 
     // Define a template function with the same name as the macro

tests/it/issues.d

@@ -937,6 +937,12 @@ version(linux) // linux specific header in the test
     }
 }
 
+// the original fix for this issue had to do with ordering, but it
+// also ended up guarding a `static if` that checked if a macro
+// already existed before trying to define it again. Unfortunately,
+// too many static ifs caused the compiler to have ordering problems,
+// but removing that caused this test to fail. The "fix" is to ask for
+// scoped enums so that it doesn't try to define `BAR` twice.
 @Tags("issue")
 @("79")
 unittest {
@@ -960,7 +966,8 @@ unittest {
                       // The bug had to do with ordering.
                       enum TheEnum { BAR = 42 };
                   `);
-        runPreprocessOnly("app.dpp");
+
+        runPreprocessOnly("app.dpp", "--scoped-enums");
         shouldCompile("app.d");
     }
 }