From 32b26ccf9e66dfb2c5342d57ca52d93a9292e9bc Mon Sep 17 00:00:00 2001
From: Mike Gelfand <mikedld@mikedld.com>
Date: Tue, 24 Jun 2025 22:50:19 +0100
Subject: [PATCH] mi: add/fix include guards where missing/broken

Signed-off-by: Mike Gelfand <mikedld@mikedld.com>
---
 mi/miline.h     |  2 +-
 mi/mipoly.h     |  5 +++++
 mi/misprite.h   | 21 +++++++++++++--------
 mi/miwideline.h |  5 +++++
 mi/mizerarc.h   |  5 +++++
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/mi/miline.h b/mi/miline.h
index 7ef3b015a..c40e4a98e 100644
--- a/mi/miline.h
+++ b/mi/miline.h
@@ -1,4 +1,3 @@
-
 /*
 
 Copyright 1994, 1998  The Open Group
@@ -26,6 +25,7 @@ in this Software without prior written authorization from The Open Group.
 */
 
 #ifndef MILINE_H
+#define MILINE_H
 
 #include "screenint.h"
 #include "privates.h"
diff --git a/mi/mipoly.h b/mi/mipoly.h
index 10632f232..b947d20ce 100644
--- a/mi/mipoly.h
+++ b/mi/mipoly.h
@@ -78,6 +78,9 @@ from The Open Group.
  *     drawn (as with the even-odd rule).
  */
 
+#ifndef XSERVER_MIPOLY_H
+#define XSERVER_MIPOLY_H
+
 /*
  * for the winding number rule
  */
@@ -172,3 +175,5 @@ typedef struct _ScanLineListBlock {
       pAET = pAET->next; \
    } \
 }
+
+#endif /* XSERVER_MIPOLY_H */
diff --git a/mi/misprite.h b/mi/misprite.h
index aa67f3229..db0dce25f 100644
--- a/mi/misprite.h
+++ b/mi/misprite.h
@@ -1,11 +1,3 @@
-/*
- * misprite.h
- *
- * software-sprite/sprite drawing interface spec
- *
- * mi versions of these routines exist.
- */
-
 /*
 
 Copyright 1989, 1998  The Open Group
@@ -31,6 +23,17 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 */
 
+/*
+ * misprite.h
+ *
+ * software-sprite/sprite drawing interface spec
+ *
+ * mi versions of these routines exist.
+ */
+
+#ifndef XSERVER_MISPRITE_H
+#define XSERVER_MISPRITE_H
+
 Bool miSpriteInitialize(ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs);
 
 Bool miDCRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);
@@ -44,3 +47,5 @@ Bool miDCRestoreUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
                             int x, int y, int w, int h);
 Bool miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);
 void miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);
+
+#endif /* XSERVER_MISPRITE_H */
diff --git a/mi/miwideline.h b/mi/miwideline.h
index 88bc3d6c8..39a2727e4 100644
--- a/mi/miwideline.h
+++ b/mi/miwideline.h
@@ -28,6 +28,9 @@ from The Open Group.
 
 /* Author:  Keith Packard, MIT X Consortium */
 
+#ifndef XSERVER_MIWIDELINE_H
+#define XSERVER_MIWIDELINE_H
+
 #include "mifpoly.h"            /* for ICEIL */
 
 /*
@@ -91,3 +94,5 @@ typedef struct _LineFace {
 	ValidateGC (pDrawable, pGC); \
     } \
 }
+
+#endif /* XSERVER_MIWIDELINE_H */
diff --git a/mi/mizerarc.h b/mi/mizerarc.h
index 165e281ed..945efe088 100644
--- a/mi/mizerarc.h
+++ b/mi/mizerarc.h
@@ -24,6 +24,9 @@ in this Software without prior written authorization from The Open Group.
 
 ********************************************************/
 
+#ifndef XSERVER_MIZERARC_H
+#define XSERVER_MIZERARC_H
+
 typedef struct {
     int x;
     int y;
@@ -122,3 +125,5 @@ extern _X_EXPORT Bool miZeroArcSetup(xArc * /*arc */ ,
                                      miZeroArcRec * /*info */ ,
                                      Bool       /*ok360 */
     );
+
+#endif /* XSERVER_MIZERARC_H */