From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=55789 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PmSuQ-0008DC-JQ
	for qemu-devel@nongnu.org; Mon, 07 Feb 2011 10:21:49 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gingold@adacore.com>) id 1PmSuM-00046g-BA
	for qemu-devel@nongnu.org; Mon, 07 Feb 2011 10:21:43 -0500
Received: from mel.act-europe.fr ([194.98.77.210]:42694)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gingold@adacore.com>) id 1PmSuM-00046O-4I
	for qemu-devel@nongnu.org; Mon, 07 Feb 2011 10:21:42 -0500
From: Tristan Gingold <gingold@adacore.com>
Date: Mon,  7 Feb 2011 16:21:40 +0100
Message-Id: <1297092100-19171-1-git-send-email-gingold@adacore.com>
Subject: [Qemu-devel] [PATCH] scripts: add a guard macro in generated .h
	files
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Tristan Gingold <gingold@adacore.com>

To avoid redefinition warnings.

Signed-off-by: Tristan Gingold <gingold@adacore.com>
---
 rules.mak             |    2 +-
 scripts/create_config |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/rules.mak b/rules.mak
index ed59c9e..fb38f96 100644
--- a/rules.mak
+++ b/rules.mak
@@ -57,7 +57,7 @@ find-in-path = $(if $(find-string /, $1), \
 	@test -f $@ || cp $< $@
 
 %.h-timestamp: %.mak
-	$(call quiet-command, sh $(SRC_PATH)/scripts/create_config < $< > $@, "  GEN   $*.h")
+	$(call quiet-command, sh $(SRC_PATH)/scripts/create_config $* < $< > $@, "  GEN   $*.h")
 	@cmp $@ $*.h >/dev/null 2>&1 || cp $@ $*.h
 
 # will delete the target of a rule if commands exit with a nonzero exit status
diff --git a/scripts/create_config b/scripts/create_config
index 0098e68..0302eab 100755
--- a/scripts/create_config
+++ b/scripts/create_config
@@ -1,7 +1,17 @@
 #!/bin/sh
 
+if [ $# -ne 1 ]; then
+  echo "Usage: $0 filename" 2>&1
+  exit 1
+fi
+
+cond_macro=`echo $1 | tr a-z- A-Z_`_H
+
 echo "/* Automatically generated by create_config - do not modify */"
 
+echo "#ifndef $cond_macro"
+echo "#define $cond_macro"
+
 while read line; do
 
 case $line in
@@ -101,3 +111,5 @@ case $line in
 esac
 
 done # read
+
+echo "#endif /* $cond_macro */"
-- 
1.7.3.GIT