From dee16edd2e1f0f7ba60117c4830e16112018308b Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 18 Mar 2024 14:26:45 +0100
Subject: [PATCH] xfree86: os-support: move _NEED_SYSI86 guarded block to
 sun_vid.c

The sun_vid.c driver seems to be the only actual consumer left, so it
can be dropped from public headers and moved to sun_vid.c instead.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1414>
---
 hw/xfree86/os-support/solaris/sun_vid.c |  7 +++++--
 hw/xfree86/os-support/xf86_OSlib.h      | 16 ----------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index a546f1f53..fa7c2a82e 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -51,8 +51,11 @@
 #include <sys/types.h>          /* get __x86 definition if not set by compiler */
 
 #if defined(__i386__) || defined(__i386) || defined(__x86)
-#define _NEED_SYSI86
-#endif
+#include <sys/tss.h>
+#include <sys/sysi86.h>
+#include <sys/psw.h>
+#endif /* defined(__i386__) || defined(__i386) || defined(__x86) */
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 768789e8e..4896b9957 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -93,22 +93,6 @@
 
 #include <errno.h>
 
-#if defined(_NEED_SYSI86)
-#if !(defined (__sun) && defined (SVR4))
-#include <sys/immu.h>
-#include <sys/region.h>
-#include <sys/proc.h>
-#endif
-#include <sys/tss.h>
-#include <sys/sysi86.h>
-#if defined(SVR4) && !defined(__sun)
-#include <sys/seg.h>
-#endif                          /* SVR4 && !__sun */
-#if defined(__sun) && (defined (__i386__) || defined(__i386) || defined(__x86))  && defined (SVR4)
-#include <sys/psw.h>
-#endif
-#endif                          /* _NEED_SYSI86 */
-
 #if !defined(__sun) || defined(HAVE_SYS_VT_H)
 #define HAS_USL_VTS
 #endif