Skip to content

Commit 0d10018

Browse files
committed
check for definition of JSON_IS_AMALGAMATION before setting it to avoid compiler warning of redefintion.
1 parent 34bdbb5 commit 0d10018

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

amalgamate.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ def amalgamate_source(source_top_dir=None,
6565
header.add_text("# define JSON_AMALGATED_H_INCLUDED")
6666
header.add_text("/// If defined, indicates that the source file is amalgated")
6767
header.add_text("/// to prevent private header inclusion.")
68+
header.add_text('#ifndef JSON_IS_AMALGAMATION')
6869
header.add_text("#define JSON_IS_AMALGAMATION")
70+
header.add_text('#endif')
6971
header.add_file("include/json/version.h")
7072
header.add_file("include/json/config.h")
7173
header.add_file("include/json/forwards.h")
@@ -92,7 +94,9 @@ def amalgamate_source(source_top_dir=None,
9294
header.add_text("# define JSON_FORWARD_AMALGATED_H_INCLUDED")
9395
header.add_text("/// If defined, indicates that the source file is amalgated")
9496
header.add_text("/// to prevent private header inclusion.")
97+
header.add_text('#ifndef JSON_IS_AMALGAMATION')
9598
header.add_text("#define JSON_IS_AMALGAMATION")
99+
header.add_text('#endif')
96100
header.add_file("include/json/config.h")
97101
header.add_file("include/json/forwards.h")
98102
header.add_text("#endif //ifndef JSON_FORWARD_AMALGATED_H_INCLUDED")

0 commit comments

Comments
 (0)