From e446fdc14afdd89cee68254a020b5e2f3438beef Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue, 14 Oct 2025 13:29:30 +0300
Subject: [PATCH] xfree86: add missing headers to build sun_init.c on
 Solaris/SPARC

Fixes: https://github.com/X11Libre/xserver/commit/0f715b4ca49b8c0814e540574cc97f31c3b7ec34 ("xfree86: os-support: move hidden Solaris-specific symbols out of public header")
Fixes: https://github.com/X11Libre/xserver/commit/e2fa0d2ae0d96bac694e6249f77745071fa5ebfe ("fix including <sys/mman.h>")

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2070>

Further explanation about this commit by @alanc:

This particular set of `#ifdefs` matches the ones around the code using the fbio ioctls and mmap calls in the `xf86CloseConsole()` code later in the file:
https://gitlab.freedesktop.org/xorg/xserver/-/blob/c62cd2feaadaa49c385e277bb97fa7e3b48e3c4f/hw/xfree86/os-support/solaris/sun_init.c#L281
reflecting the lack of /dev/fb style drivers on x86 systems on Solaris.
---
 hw/xfree86/os-support/solaris/sun_init.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
index b88cf2cbe0..d623c375f8 100644
--- a/hw/xfree86/os-support/solaris/sun_init.c
+++ b/hw/xfree86/os-support/solaris/sun_init.c
@@ -39,6 +39,11 @@
 #include <sys/kd.h>
 #endif
 
+#if !defined(__i386__) && !defined(__i386) && !defined(__x86)
+#include <sys/fbio.h>
+#include <sys/mman.h>
+#endif
+
 #include "os/osdep.h"
 
 /*