X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/aa1082f28ddd05f3b946ca1a9c6bfaa17d18aca5..79ba130cb5776f994f6a3f0f87159d8cbc5ff129:/genmodes

diff --git a/genmodes b/genmodes
index 48175ce..a69229a 100755
--- a/genmodes
+++ b/genmodes
@@ -7,7 +7,7 @@ for i in $baselist; do
   I=`echo "$i" | tr -d '\n' | tr a-z A-Z | tr -c a-zA-Z0-9 _`
   for j in $extlist; do
     J=`echo "$j" | tr -d '\n' | tr a-z A-Z | tr -c a-zA-Z0-9 _`
-    guard="${I}_${J}_H"
+    guard="CATACOMB_${I}_${J}_H"
     cat >$i-$j.h <<EOF
 /* -*-c-*-
  *
@@ -21,11 +21,11 @@ for i in $baselist; do
   extern "C" {
 #endif
 
-#ifndef ${J}_H
+#ifndef CATACOMB_${J}_H
 #  include "$j.h"
 #endif
 
-#ifndef ${I}_H
+#ifndef CATACOMB_${I}_H
 #  include "$i.h"
 #endif
 
@@ -40,10 +40,11 @@ EOF
     cat >$i-$j.c <<EOF
 /* -*-c-*-
  *
- * $i-$j.h [generated]
+ * $i-$j.c [generated]
  */
 
 #include "$i-$j.h"
+#include "$j-def.h"
 ${J}_DEF($I, $i)
 EOF
   done