fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 08:10:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "xkb: unexport XkbRF_GetComponents()"

Browse source 
This reverts commit d3b328ba4a.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046>
This commit is contained in:
Alan Coopersmith 2025-07-12 11:47:06 -07:00
parent fef268f680
commit ef329d6a5c
4 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/xkbrules.h
View file

@ -80,6 +80,14 @@ typedef struct _XkbRF_Rules {
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
/* Seems preferable to dragging xkbstr.h in. */
struct _XkbComponentNames;
extern _X_EXPORT Bool XkbRF_GetComponents(XkbRF_RulesPtr /* rules */ ,
XkbRF_VarDefsPtr /* var_defs */ ,
struct _XkbComponentNames * /* names */
);
extern _X_EXPORT Bool XkbRF_LoadRules(FILE * /* file */ , extern _X_EXPORT Bool XkbRF_LoadRules(FILE * /* file */ ,
XkbRF_RulesPtr /* rules */ XkbRF_RulesPtr /* rules */
); );

1
xkb/ddxLoad.c
View file

@ -42,7 +42,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "os/osdep.h" #include "os/osdep.h"
#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 "inputstr.h" #include "inputstr.h"
#include "scrnintstr.h" #include "scrnintstr.h"

3
xkb/maprules.c
View file

@ -40,9 +40,6 @@
#include <X11/Xfuncs.h> #include <X11/Xfuncs.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include "xkb/xkbrules_priv.h"
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "dix.h" #include "dix.h"

18
xkb/xkbrules_priv.h
View file

@ -1,18 +0,0 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_XKB_XKBRULES_PRIV_H
#define _XSERVER_XKB_XKBRULES_PRIV_H
#include <X11/Xdefs.h>
#include "include/xkbrules.h"
struct _XkbComponentNames;
Bool XkbRF_GetComponents(XkbRF_RulesPtr rules,
XkbRF_VarDefsPtr var_defs,
struct _XkbComponentNames *names);
#endif /* _XSERVER_XKB_XKBRULES_PRIV_H */