From f8fc46cbbfa3253d24d65fc2d129f8b4b5fd76aa Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 5 Apr 2024 17:09:31 +0200
Subject: [PATCH] include: drop now empty xkbfile.h

This (public) file isn't used by anybody outside Xserver tree
and doesn't contain anything useful anymore, so lets drop it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1729>
---
 hw/xfree86/sdksyms.sh |  1 -
 include/meson.build   |  1 -
 include/xkbfile.h     | 32 --------------------------------
 include/xkbsrv.h      |  2 +-
 test/test_xkb.c       |  1 -
 xkb/xkbInit.c         |  1 -
 xkb/xkbout.c          |  1 -
 7 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 include/xkbfile.h

diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 982987472..f2862b074 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -270,7 +270,6 @@ cat > sdksyms.c << EOF
 #include "window.h"
 #include "windowstr.h"
 #include "xace.h"
-#include "xkbfile.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
 #include "xkbrules.h"
diff --git a/include/meson.build b/include/meson.build
index ac2366519..d4ea7fe44 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -498,7 +498,6 @@ if build_xorg
             'displaymode.h',
             'window.h',
             'windowstr.h',
-            'xkbfile.h',
             'xkbsrv.h',
             'xkbstr.h',
             'xkbrules.h',
diff --git a/include/xkbfile.h b/include/xkbfile.h
deleted file mode 100644
index 9bc25cd94..000000000
--- a/include/xkbfile.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/************************************************************
- Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies and that both that copyright
- notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
- THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- ********************************************************/
-
-#ifndef _XKBFILE_H_
-#define	_XKBFILE_H_ 1
-
-#include "xkbstr.h"
-
-#endif                          /* _XKBFILE_H_ */
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 2f291886b..ab3a40743 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -818,7 +818,7 @@ extern _X_EXPORT Bool XkbDeviceApplyKeymap(DeviceIntPtr /* dst */ ,
 extern _X_EXPORT void XkbCopyControls(XkbDescPtr /* dst */ ,
                                       XkbDescPtr /* src */ );
 
-#include "xkbfile.h"
+#include "xkbstr.h"
 #include "xkbrules.h"
 
 extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(DeviceIntPtr /* keybd */ ,
diff --git a/test/test_xkb.c b/test/test_xkb.c
index 2fd9d1f36..11a0f4ce8 100644
--- a/test/test_xkb.c
+++ b/test/test_xkb.c
@@ -44,7 +44,6 @@
 #include <xkbsrv.h>
 #include "../xkb/xkbgeom.h"
 #include <X11/extensions/XKMformat.h>
-#include "xkbfile.h"
 #include <assert.h>
 
 #include "tests-common.h"
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 2819935eb..edd4de4b5 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -48,7 +48,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "property.h"
 #include "scrnintstr.h"
 #include "xkbgeom.h"
-#include "xkbfile.h"
 
 #define	CREATE_ATOM(s)	MakeAtom(s,sizeof(s)-1,1)
 
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index e1b97a56f..a8b2f1523 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -46,7 +46,6 @@
 #include <xkbsrv.h>
 
 #include "xkbgeom.h"
-#include "xkbfile.h"
 
 #define	VMOD_HIDE_VALUE	0
 #define	VMOD_SHOW_VALUE	1