fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-05 15:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "xkb: unexport functions from xkbout.c"

Browse source 
This reverts commit 660657a2c3.

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 f666efd73a
commit f508575818
4 changed files with 42 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
include/xkbfile.h
View file

@ -71,6 +71,48 @@ typedef void (*XkbFileAddOnFunc) (FILE * /* file */ ,
_XFUNCPROTOBEGIN
extern _X_EXPORT Bool XkbWriteXKBKeycodes(FILE * /* file */ ,
XkbDescPtr /* result */ ,
Bool /* topLevel */ ,
Bool /* showImplicit */ ,
XkbFileAddOnFunc /* addOn */ ,
void * /* priv */
);
extern _X_EXPORT Bool XkbWriteXKBKeyTypes(FILE * /* file */ ,
XkbDescPtr /* result */ ,
Bool /* topLevel */ ,
Bool /* showImplicit */ ,
XkbFileAddOnFunc /* addOn */ ,
void * /* priv */
);
extern _X_EXPORT Bool XkbWriteXKBCompatMap(FILE * /* file */ ,
XkbDescPtr /* result */ ,
Bool /* topLevel */ ,
Bool /* showImplicit */ ,
XkbFileAddOnFunc /* addOn */ ,
void * /* priv */
);
extern _X_EXPORT Bool XkbWriteXKBSymbols(FILE * /* file */ ,
XkbDescPtr /* result */ ,
Bool /* topLevel */ ,
Bool /* showImplicit */ ,
XkbFileAddOnFunc /* addOn */ ,
void * /* priv */
);
extern _X_EXPORT Bool XkbWriteXKBGeometry(FILE * /* file */ ,
XkbDescPtr /* result */ ,
Bool /* topLevel */ ,
Bool /* showImplicit */ ,
XkbFileAddOnFunc /* addOn */ ,
void * /* priv */
);
/***====================================================================***/
extern _X_EXPORT unsigned XkmReadFile(FILE * /* file */ ,
unsigned /* need */ ,
unsigned /* want */ ,

1
xkb/xkbfmisc.c
View file

@ -37,7 +37,6 @@
#include <X11/Xproto.h>
#include "xkb/xkbfmisc_priv.h"
#include "xkb/xkbout_priv.h"
#include "misc.h"
#include "inputstr.h"

1
xkb/xkbout.c
View file

@ -36,7 +36,6 @@
#include <X11/extensions/XKMformat.h>
#include "xkb/xkbfmisc_priv.h"
#include "xkb/xkbout_priv.h"
#include "xkb/xkbtext_priv.h"
#include "misc.h"

32
xkb/xkbout_priv.h
View file

@ -1,32 +0,0 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_XKB_XKBFOUT_PRIV_H
#define _XSERVER_XKB_XKBFOUT_PRIV_H
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
#include "xkbstr.h"
typedef void (*XkbFileAddOnFunc) (FILE *file,
XkbDescPtr result,
Bool topLevel,
Bool showImplicit,
int fileSection,
void *priv);
Bool XkbWriteXKBKeyTypes(FILE *file, XkbDescPtr result, Bool topLevel,
Bool showImplicit, XkbFileAddOnFunc addOn, void *priv);
Bool XkbWriteXKBKeycodes(FILE *file, XkbDescPtr result, Bool topLevel,
Bool showImplicit, XkbFileAddOnFunc addOn, void *priv);
Bool XkbWriteXKBCompatMap(FILE *file, XkbDescPtr result, Bool topLevel,
Bool showImplicit, XkbFileAddOnFunc addOn, void *priv);
Bool XkbWriteXKBSymbols(FILE *file, XkbDescPtr result, Bool topLevel,
Bool showImplicit, XkbFileAddOnFunc addOn, void *priv);
Bool XkbWriteXKBGeometry(FILE *file, XkbDescPtr result, Bool topLevel,
Bool showImplicit, XkbFileAddOnFunc addOn, void *priv);
#endif /* _XSERVER_XKB_XKBFOUT_PRIV_H */