From 564d269e622f0f8187a6f463d0df710e3709a4da Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 4 Jul 2025 16:55:05 +0200
Subject: [PATCH] miext: drop using HAVE_DIX_CONFIG_H

This symbol is always defined, and the header is always present,
so no need to check for it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 miext/damage/damage.h           |  7 ++-----
 miext/damage/damagestr.h        |  7 ++-----
 miext/rootless/rootless.h       |  7 ++-----
 miext/rootless/rootlessCommon.h | 10 ++++------
 miext/rootless/rootlessConfig.h |  7 ++-----
 miext/rootless/rootlessWindow.h |  7 ++-----
 miext/shadow/shrotpack.h        |  3 ---
 miext/sync/misync.h             |  7 ++-----
 miext/sync/misyncstr.h          |  7 ++-----
 9 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/miext/damage/damage.h b/miext/damage/damage.h
index 525b2db5d..12e849b10 100644
--- a/miext/damage/damage.h
+++ b/miext/damage/damage.h
@@ -19,14 +19,11 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _DAMAGE_H_
 #define _DAMAGE_H_
 
+#include <dix-config.h>
+
 typedef struct _damage *DamagePtr;
 
 typedef enum _damageReportLevel {
diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h
index 5517d24e0..46f800bec 100644
--- a/miext/damage/damagestr.h
+++ b/miext/damage/damagestr.h
@@ -19,14 +19,11 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _DAMAGESTR_H_
 #define _DAMAGESTR_H_
 
+#include <dix-config.h>
+
 #include "damage.h"
 #include "gcstruct.h"
 #include "privates.h"
diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h
index b375731bf..7521562c1 100644
--- a/miext/rootless/rootless.h
+++ b/miext/rootless/rootless.h
@@ -27,14 +27,11 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _ROOTLESS_H
 #define _ROOTLESS_H
 
+#include <dix-config.h>
+
 #include "rootlessConfig.h"
 #include "mi.h"
 #include "gcstruct.h"
diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h
index 9fdb98e40..80ce9dd70 100644
--- a/miext/rootless/rootlessCommon.h
+++ b/miext/rootless/rootlessCommon.h
@@ -27,15 +27,13 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <stdint.h>
 #ifndef _ROOTLESSCOMMON_H
 #define _ROOTLESSCOMMON_H
 
+#include <dix-config.h>
+
+#include <stdint.h>
+
 #include "misc.h"
 #include "rootless.h"
 #include "fb.h"
diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h
index 80c2f6d8a..b54e084d7 100644
--- a/miext/rootless/rootlessConfig.h
+++ b/miext/rootless/rootlessConfig.h
@@ -26,14 +26,11 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _ROOTLESSCONFIG_H
 #define _ROOTLESSCONFIG_H
 
+#include <dix-config.h>
+
 /*# define ROOTLESSDEBUG*/
 
 #define ROOTLESS_PROTECT_ALPHA TRUE
diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h
index 00e95b8a0..def7f885f 100644
--- a/miext/rootless/rootlessWindow.h
+++ b/miext/rootless/rootlessWindow.h
@@ -26,14 +26,11 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _ROOTLESSWINDOW_H
 #define _ROOTLESSWINDOW_H
 
+#include <dix-config.h>
+
 #include "dix/screen_hooks_priv.h"
 
 #include "rootlessCommon.h"
diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h
index 4814991f0..d24c36e6e 100644
--- a/miext/shadow/shrotpack.h
+++ b/miext/shadow/shrotpack.h
@@ -25,10 +25,7 @@
  * Thanks to Daniel Chemko <dchemko@intrinsyc.com> for making the 90 and 180
  * orientations work.
  */
-
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <stdlib.h>
 
diff --git a/miext/sync/misync.h b/miext/sync/misync.h
index 4748fa4ae..a7527fbbd 100644
--- a/miext/sync/misync.h
+++ b/miext/sync/misync.h
@@ -20,14 +20,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _MISYNC_H_
 #define _MISYNC_H_
 
+#include <dix-config.h>
+
 typedef struct _SyncObject SyncObject;
 typedef struct _SyncFence SyncFence;
 typedef struct _SyncTrigger SyncTrigger;
diff --git a/miext/sync/misyncstr.h b/miext/sync/misyncstr.h
index 21cb0b257..155e2e85a 100644
--- a/miext/sync/misyncstr.h
+++ b/miext/sync/misyncstr.h
@@ -20,14 +20,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _MISYNCSTR_H_
 #define _MISYNCSTR_H_
 
+#include <dix-config.h>
+
 #include <stdint.h>
 #include "dix.h"
 #include "misync.h"