frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(!1799) xkb: unexport internal variables 

These aren't used by any drivers/modules, and it doesn't seem make much
sense doing so, thus no need to keep them exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-03 17:25:17 +02:00
parent 51844ba169
commit fdb47fa524
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86Config.c
View File

@ -52,6 +52,7 @@
#include "dix/resource_priv.h" #include "dix/resource_priv.h"
#include "os/osdep.h" #include "os/osdep.h"
#include "xkb/xkbsrv_priv.h"
#include "xf86.h" #include "xf86.h"
#include "xf86Modes.h" #include "xf86Modes.h"
@ -68,7 +69,6 @@
#include "loaderProcs.h" #include "loaderProcs.h"
#include "xf86Xinput_priv.h" #include "xf86Xinput_priv.h"
#include "xkbsrv.h"
#include "picture.h" #include "picture.h"
#ifdef DPMSExtension #ifdef DPMSExtension
#include "dpmsproc.h" #include "dpmsproc.h"

2
hw/xwayland/xwayland-input.c
View File

@ -35,9 +35,9 @@
#include "mi/mi_priv.h" #include "mi/mi_priv.h"
#include "mi/mipointer_priv.h" #include "mi/mipointer_priv.h"
#include "os/bug_priv.h" #include "os/bug_priv.h"
#include "xkb/xkbsrv_priv.h"
#include <inputstr.h> #include <inputstr.h>
#include <xkbsrv.h>
#include <xserver-properties.h> #include <xserver-properties.h>
#include <inpututils.h> #include <inpututils.h>
#include <mipointer.h> #include <mipointer.h>

4
hw/xwin/InitOutput.c
View File

@ -38,6 +38,7 @@ from The Open Group.
#include "dix/screenint_priv.h" #include "dix/screenint_priv.h"
#include "os/ddx_priv.h" #include "os/ddx_priv.h"
#include "os/osdep.h" #include "os/osdep.h"
#include "xkb/xkbsrv_priv.h"
#include "winmsg.h" #include "winmsg.h"
#include "winconfig.h" #include "winconfig.h"
@ -48,9 +49,6 @@ from The Open Group.
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#include <mntent.h> #include <mntent.h>
#endif #endif
#if defined(WIN32)
#include "xkbsrv.h"
#endif
#ifdef RELOCATE_PROJECTROOT #ifdef RELOCATE_PROJECTROOT
#pragma push_macro("Status") #pragma push_macro("Status")
#undef Status #undef Status

8
include/xkbsrv.h
View File

@ -213,14 +213,6 @@ typedef struct {
/***====================================================================***/ /***====================================================================***/
extern _X_EXPORT int XkbReqCode;
extern _X_EXPORT int XkbEventBase;
extern _X_EXPORT int XkbKeyboardErrorCode;
extern _X_EXPORT const char *XkbBaseDirectory;
extern _X_EXPORT const char *XkbBinDirectory;
extern _X_EXPORT CARD32 xkbDebugFlags;
#define Status int #define Status int
extern _X_EXPORT void XkbUseMsg(void extern _X_EXPORT void XkbUseMsg(void

2
xkb/ddxLoad.c
View File

@ -43,11 +43,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkb/xkbfile_priv.h" #include "xkb/xkbfile_priv.h"
#include "xkb/xkbfmisc_priv.h" #include "xkb/xkbfmisc_priv.h"
#include "xkb/xkbrules_priv.h" #include "xkb/xkbrules_priv.h"
#include "xkb/xkbsrv_priv.h"
#include "inputstr.h" #include "inputstr.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "windowstr.h" #include "windowstr.h"
#include <xkbsrv.h>
#define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\"" #define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
#define ERROR_PREFIX "\"> \"" #define ERROR_PREFIX "\"> \""

7
xkb/xkbsrv_priv.h
View File

@ -116,4 +116,11 @@ extern DevPrivateKeyRec xkbDevicePrivateKeyRec;
#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, &xkbDevicePrivateKeyRec)) #define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, &xkbDevicePrivateKeyRec))
extern int XkbReqCode;
extern int XkbEventBase;
extern int XkbKeyboardErrorCode;
extern const char *XkbBaseDirectory;
extern const char *XkbBinDirectory;
extern CARD32 xkbDebugFlags;
#endif /* _XSERVER_XKBSRV_PRIV_H_ */ #endif /* _XSERVER_XKBSRV_PRIV_H_ */