From 2db18509c5c2fdb522482cbae4c2ee1a47b4eab8 Mon Sep 17 00:00:00 2001
From: "Darryl L. Miles" <darryl.miles@darrylmiles.org>
Date: Fri, 31 Jan 2025 18:53:59 +0000
Subject: [PATCH] header file #endif guard middle program once style
 consistency

---
 bplane/bpOpaque.h      |  4 ++--
 database/database.h.in | 16 ++++++++--------
 database/fonts.h       |  4 ++--
 extflat/EFint.h        |  4 ++--
 mzrouter/mzInternal.h  |  6 +++---
 tiles/tile.h           |  4 ++--
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bplane/bpOpaque.h b/bplane/bpOpaque.h
index c4185b43..23dffc01 100644
--- a/bplane/bpOpaque.h
+++ b/bplane/bpOpaque.h
@@ -30,9 +30,9 @@
 #ifndef _MAGIC__BPLANE__BPOPAQUE_H
 #define _MAGIC__BPLANE__BPOPAQUE_H
 
-#ifndef _IHASH_H
+#ifndef _MAGIC__UTILS__IHASH_H
 #include "utils/ihash.h"
-#endif /* _IHASH_H */
+#endif
 
 /*
  * bpOpaque.h --
diff --git a/database/database.h.in b/database/database.h.in
index 20da7615..4a1de57f 100644
--- a/database/database.h.in
+++ b/database/database.h.in
@@ -25,21 +25,21 @@
 #ifndef _MAGIC__DATABASE__DATABASE_H
 #define _MAGIC__DATABASE__DATABASE_H
 
-#ifndef	_TILES_H
+#ifndef _MAGIC__TILES__TILE_H
 #include "tiles/tile.h"
-#endif	/* _TILES_H */
+#endif
 
-#ifndef	_HASH_H
+#ifndef _MAGIC__UTILS__HASH_H
 #include "utils/hash.h"
-#endif	/* _HASH_H */
+#endif
 
-#ifndef	_STACK_H
+#ifndef _MAGIC__UTILS__STACK_H
 #include "utils/stack.h"
-#endif	/* _STACK_H */
+#endif
 
-#ifndef _BPLANE_H
+#ifndef _MAGIC__BPLANE__BPLANE_H
 #include "bplane/bplane.h"
-#endif /* _BPLANE_H */
+#endif
 
 /* ----------------------- Tunable constants -------------------------- */
 
diff --git a/database/fonts.h b/database/fonts.h
index 67f3d093..27e91a47 100644
--- a/database/fonts.h
+++ b/database/fonts.h
@@ -13,9 +13,9 @@
 #ifndef _MAGIC__DATABASE__FONTS_H
 #define _MAGIC__DATABASE__FONTS_H
 
-#ifndef	_TILES_H
+#ifndef _MAGIC__TILES__TILE_H
 #include "tiles/tile.h"
-#endif	/* _TILES_H */
+#endif
 
 /* ---------------------------- Fonts --------------------------------- */
 
diff --git a/extflat/EFint.h b/extflat/EFint.h
index 8ef63242..904d0ef3 100644
--- a/extflat/EFint.h
+++ b/extflat/EFint.h
@@ -187,14 +187,14 @@ typedef struct def
  * structure describes the indices and the separation between elements
  * (for computing transforms).
  */
-#ifndef _DATABASE_H
+#ifndef _MAGIC__DATABASE__DATABASE_H
 typedef struct
 {
     int		 ar_xlo, ar_xhi;
     int		 ar_ylo, ar_yhi;
     int		 ar_xsep, ar_ysep;
 } ArrayInfo;
-#endif /* _DATABASE_H */
+#endif /* _MAGIC__DATABASE__DATABASE_H */
 
 typedef struct use
 {
diff --git a/mzrouter/mzInternal.h b/mzrouter/mzInternal.h
index 943e0d87..189fec0f 100644
--- a/mzrouter/mzInternal.h
+++ b/mzrouter/mzInternal.h
@@ -39,15 +39,15 @@
  *  the head of that function.
  */
 
-#ifndef _MAGIC_H
+#ifndef _MAGIC__UTILS__MAGIC_H
 #include "utils/magic.h"
 #endif
 
-#ifndef _MZROUTER_H
+#ifndef _MAGIC__MZROUTER__MZROUTER_H
 #include "mzrouter/mzrouter.h"
 #endif
 
-#ifndef _HEAP_H
+#ifndef _MAGIC__UTILS__HEAP_H
 #include "utils/heap.h"
 #endif
 
diff --git a/tiles/tile.h b/tiles/tile.h
index 4bcac11a..4e6638d9 100644
--- a/tiles/tile.h
+++ b/tiles/tile.h
@@ -23,10 +23,10 @@
 #ifndef _MAGIC__TILES__TILE_H
 #define	_MAGIC__TILES__TILE_H
 
-#ifndef _MAGIC_H
+#ifndef _MAGIC__UTILS__MAGIC_H
 #include "utils/magic.h"
 #endif
-#ifndef _GEOMETRY_H
+#ifndef _MAGIC__UTILS__GEOMETRY_H
 #include "utils/geometry.h"
 #endif