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

xkb: unexport functions from xkbout.c 

These are only used inside xkb/*, so no need to keep them exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1729>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-05 16:33:44 +02:00 committed by Marge Bot
parent 5d98664ec1
commit 660657a2c3
4 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
include/xkbfile.h
View File

@ -71,48 +71,6 @@ typedef void (*XkbFileAddOnFunc) (FILE * /* file */ ,
_XFUNCPROTOBEGIN _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 */ , extern _X_EXPORT unsigned XkmReadFile(FILE * /* file */ ,
unsigned /* need */ , unsigned /* need */ ,
unsigned /* want */ , unsigned /* want */ ,

1
xkb/xkbfmisc.c
View File

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

1
xkb/xkbout.c
View File

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

32
xkb/xkbout_priv.h Normal file
View File

@ -0,0 +1,32 @@
/* 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 */