From 42fc2b772f7466e71928afaa19efaec935013f58 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Tue, 10 Aug 2004 18:07:20 +0000
Subject: [PATCH] * src/ltlvisit/apcollect.hh: Fix include guard.  Report from
 Denis. * src/sanity/includes.test: Include files twice to check include
 guards.

---
 ChangeLog                 | 4 ++++
 src/ltlvisit/apcollect.hh | 2 +-
 src/sanity/includes.test  | 6 +++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6bee1d2f6..9770cdf13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-08-10  Alexandre Duret-Lutz  <adl@src.lip6.fr>
 
+	* src/ltlvisit/apcollect.hh: Fix include guard.  Report from Denis.
+	* src/sanity/includes.test: Include files twice to check include
+	guards.
+
 	* src/tgbatest/ltl2tgba.cc (main): Fix another gcc warning in case
 	assert() is disabled.
 
diff --git a/src/ltlvisit/apcollect.hh b/src/ltlvisit/apcollect.hh
index e2e651ebd..8897cce07 100644
--- a/src/ltlvisit/apcollect.hh
+++ b/src/ltlvisit/apcollect.hh
@@ -20,7 +20,7 @@
 // 02111-1307, USA.
 
 #ifndef SPOT_LTLVISIT_APCOLLECT_HH
-# define SPOT_LTLVISIT_AP_COLLECT_HH
+# define SPOT_LTLVISIT_APCOLLECT_HH
 
 #include <set>
 #include "ltlvisit/postfix.hh"
diff --git a/src/sanity/includes.test b/src/sanity/includes.test
index 01b8d15e1..2e5743b08 100755
--- a/src/sanity/includes.test
+++ b/src/sanity/includes.test
@@ -8,7 +8,11 @@ rm -f failures
 
 for file in `find "$INCDIR" -name "${1-*}.hh" -type f -print |
              sed "s,$INCDIR/,,g"`; do
-   echo "#include <$file>" > incltest.cc
+   cat >incltest.cc <<EOF
+// Include the file twice, so we detect missing inclusion guards.
+#include <$file>
+#include <$file>
+EOF
    if $CXX $CPPFLAGS $CXXFLAGS -c incltest.cc; then
       echo "PASS: $file"
    else