* src/ltlvisit/apcollect.hh: Fix include guard. Report from Denis.

* src/sanity/includes.test: Include files twice to check include
guards.

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.
 

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"

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