From b7093fde762cb77476ff063ab3dc42e417609be7 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon, 13 May 2024 11:17:48 -0700
Subject: [PATCH] xf86_OSlib.h: Don't need to include Solaris keyboard headers
 here

Left over from the builtin keyboard driver removed from the Xorg
server in 2006 (commit 3eeb62e8f587732e6b433c2b9c6879eb26a3f1b4).

Requires xorg/driver/xf86-input-keyboard@40ef7d9e24987eb6708d822d0ea070
to build the current keyboard driver with this change.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1541>
(cherry picked from commit a4d298d8550a2b3a05e389415eec0ca0e3adde40)
---
 hw/xfree86/os-support/xf86_OSlib.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 90d560eef..a90478ca2 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -112,15 +112,6 @@ extern _X_HIDDEN void xf86VTRelease(int);
 #if defined(__sun)
 #include <sys/fbio.h>
 extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX];
-
-#include <sys/kbd.h>
-#include <sys/kbio.h>
-
-/* undefine symbols from <sys/kbd.h> we don't need that conflict with enum
-   definitions in parser/xf86tokens.h */
-#undef STRING
-#undef LEFTALT
-#undef RIGHTALT
 #endif                          /* __sun */
 
 #if !defined(VT_ACKACQ)