|
@@ -18,7 +18,7 @@ pos = outname.find(".")
|
|
|
if pos > 0:
|
|
|
outname = outname[:pos]
|
|
|
include_re = re.compile("^#include (\".*\").*$")
|
|
|
-guard_re = re.compile("^#(?:(?:ifndef|define) [A-Z_]+_H_|endif /\* [A-Z_]+_H_ \*/)")
|
|
|
+guard_re = re.compile("^#(?:(?:ifndef|define) [A-Z_]+_H_|endif /\* [A-Z_]+_H_ \*/|endif // [A-Z_]+_H_)")
|
|
|
includes = []
|
|
|
|
|
|
print ("Starting amalgamating file "+ args.outfile)
|