From 2f2ecad0b5b18b37d620490ded23e2f85e806b90 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 29 Jan 2026 18:02:08 +0100
Subject: [PATCH] xfree86: int10: drop ifdef HAVE_XORG_CONFIG_H

Not really needed, because <xorg-config.h> is always present anyways.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xfree86/int10/generic.c         | 2 --
 hw/xfree86/int10/helper_exec.c     | 4 ----
 hw/xfree86/int10/helper_mem.c      | 2 --
 hw/xfree86/int10/stub.c            | 2 --
 hw/xfree86/int10/vbe.c             | 4 ----
 hw/xfree86/int10/vbeModes.c        | 3 ---
 hw/xfree86/int10/x86emu.c          | 3 ---
 hw/xfree86/int10/xf86int10.c       | 3 ---
 hw/xfree86/int10/xf86int10module.c | 2 --
 hw/xfree86/int10/xf86x86emu.c      | 2 --
 hw/xfree86/int10/xf86x86emu.h      | 5 -----
 11 files changed, 32 deletions(-)

diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index db26b589be..c37cb54aca 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -3,9 +3,7 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include <errno.h>
 #include <string.h>
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index 34dfb675df..830822f911 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -6,17 +6,13 @@
  *   Part of this code was inspired  by the VBIOS POSTing code in DOSEMU
  *   developed by the "DOSEMU-Development-Team"
  */
-
 /*
  * To debug port accesses define PRINT_PORT to 1.
  * Note! You also have to comment out ioperm()
  * in xf86EnableIO(). Otherwise we won't trap
  * on PIO.
  */
-
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #define PRINT_PORT 0
 
diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c
index 78d377acb7..0e4694aa35 100644
--- a/hw/xfree86/int10/helper_mem.c
+++ b/hw/xfree86/int10/helper_mem.c
@@ -3,9 +3,7 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c
index 4bbcddeda6..6209af06cb 100644
--- a/hw/xfree86/int10/stub.c
+++ b/hw/xfree86/int10/stub.c
@@ -3,9 +3,7 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include "xf86.h"
 #include "xf86str.h"
diff --git a/hw/xfree86/int10/vbe.c b/hw/xfree86/int10/vbe.c
index 01a14be83c..e37d5c43a9 100644
--- a/hw/xfree86/int10/vbe.c
+++ b/hw/xfree86/int10/vbe.c
@@ -1,4 +1,3 @@
-
 /*
  *                   XFree86 vbe module
  *               Copyright 2000 Egbert Eich
@@ -8,10 +7,7 @@
  * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
  * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  */
-
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include <string.h>
 
diff --git a/hw/xfree86/int10/vbeModes.c b/hw/xfree86/int10/vbeModes.c
index 107eae2ee1..5ff1e9f325 100644
--- a/hw/xfree86/int10/vbeModes.c
+++ b/hw/xfree86/int10/vbeModes.c
@@ -28,10 +28,7 @@
  * Authors: David Dawes <dawes@xfree86.org>
  *
  */
-
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/hw/xfree86/int10/x86emu.c b/hw/xfree86/int10/x86emu.c
index b3320e5b95..0aef1dfd74 100644
--- a/hw/xfree86/int10/x86emu.c
+++ b/hw/xfree86/int10/x86emu.c
@@ -1,7 +1,4 @@
-
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include "debug.c"
 #include "decode.c"
diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c
index 74966207e5..6629d24dfe 100644
--- a/hw/xfree86/int10/xf86int10.c
+++ b/hw/xfree86/int10/xf86int10.c
@@ -3,10 +3,7 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
-
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include "xf86.h"
 #include "compiler.h"
diff --git a/hw/xfree86/int10/xf86int10module.c b/hw/xfree86/int10/xf86int10module.c
index 00e4ce34a2..12ebefe384 100644
--- a/hw/xfree86/int10/xf86int10module.c
+++ b/hw/xfree86/int10/xf86int10module.c
@@ -3,9 +3,7 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include "xf86Module.h"
 
diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
index 3c1dae7c55..85b73bab0e 100644
--- a/hw/xfree86/int10/xf86x86emu.c
+++ b/hw/xfree86/int10/xf86x86emu.c
@@ -3,9 +3,7 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/int10/xf86x86emu.h b/hw/xfree86/int10/xf86x86emu.h
index 973d852e13..cab0c9855b 100644
--- a/hw/xfree86/int10/xf86x86emu.h
+++ b/hw/xfree86/int10/xf86x86emu.h
@@ -3,14 +3,9 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
-
 #ifndef XF86X86EMU_H_
 #define XF86X86EMU_H_
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include <x86emu.h>
 
 #define M _X86EMU_env