From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 1 Mar 2011 05:30:05 +0000 (+1030)
Subject: config.h: idempotent-wrap the generated config.h
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=62bbea8e5feea7b716c7bc8b41444080a24abc95;ds=sidebyside

config.h: idempotent-wrap the generated config.h
---

diff --git a/config.h b/config.h
index 0473fb1f..c540af30 100644
--- a/config.h
+++ b/config.h
@@ -1,3 +1,5 @@
+#ifndef CCAN_CONFIG_H
+#define CCAN_CONFIG_H
 /* Generated by CCAN configurator */
 #define CCAN_COMPILER "cc"
 #define CCAN_CFLAGS "-g -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations"
@@ -34,3 +36,4 @@
 #define HAVE_TYPEOF 1
 #define HAVE_UTIME 1
 #define HAVE_WARN_UNUSED_RESULT 1
+#endif /* CCAN_CONFIG_H */
diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 7d9db8a1..b150dadb 100644
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -337,10 +337,13 @@ int main(int argc, char *argv[])
 	unlink(INPUT_FILE);
 
 	cmd[strlen(cmd) - strlen(" -o " OUTPUT_FILE " " INPUT_FILE)] = '\0';
-	printf("/* Generated by CCAN configurator */\n");
+	printf("#ifndef CCAN_CONFIG_H\n"
+	       "#define CCAN_CONFIG_H\n"
+	       "/* Generated by CCAN configurator */\n");
 	printf("#define CCAN_COMPILER \"%s\"\n", argv[1]);
 	printf("#define CCAN_CFLAGS \"%s\"\n\n", cmd + strlen(argv[1]) + 1);
 	for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)
 		printf("#define %s %u\n", tests[i].name, tests[i].answer);
+	printf("#endif /* CCAN_CONFIG_H */\n");
 	return 0;
 }