--- old/src/jdk.jextract/share/classes/com/sun/tools/jextract/JavaSourceFactoryExt.java 2019-04-10 19:42:00.000000000 +0530 +++ new/src/jdk.jextract/share/classes/com/sun/tools/jextract/JavaSourceFactoryExt.java 2019-04-10 19:41:58.000000000 +0530 @@ -130,7 +130,7 @@ String name = macroTree.name(); MacroParser.Macro macro = macroTree.macro().get(); log.print(Level.FINE, () -> "Adding macro " + name); - addConstant(header_jsb, name, macro.type(), macro.value()); + addConstant(header_jsb, Utils.toMacroName(name), macro.type(), macro.value()); return true; } else { return false;