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

(!1799) xkb: move _XkbErrCode*() macros into private header 

These are only used internally in xkb, so 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 16:36:15 +02:00
parent 5e00e96d9a
commit 6ca16e33ac
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/xkbsrv.h
View File

@ -259,14 +259,6 @@ extern _X_EXPORT const char *XkbBinDirectory;
extern _X_EXPORT CARD32 xkbDebugFlags; extern _X_EXPORT CARD32 xkbDebugFlags;
/* "a" is a "unique" numeric identifier that just defines which error
* code statement it is. _XkbErrCode2(4, foo) means "this is the 4th error
* statement in this function". lovely.
*/
#define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff)))
#define _XkbErrCode3(a,b,c) _XkbErrCode2(a,(((unsigned int)(b))<<16)|(c))
#define _XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d)))
#define Status int #define Status int
extern _X_EXPORT void XkbUseMsg(void extern _X_EXPORT void XkbUseMsg(void

4
xkb/xkbSwap.c
View File

@ -29,9 +29,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "stdio.h" #include "stdio.h"
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "xkb/xkbsrv_priv.h"
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include <xkbsrv.h>
#include "xkbstr.h" #include "xkbstr.h"
#include "extnsionst.h" #include "extnsionst.h"
#include "xkb-procs.h" #include "xkb-procs.h"

8
xkb/xkbsrv_priv.h
View File

@ -58,6 +58,14 @@
#define _XkbLibError(c,l,d) /* Epoch fail */ #define _XkbLibError(c,l,d) /* Epoch fail */
/* "a" is a "unique" numeric identifier that just defines which error
* code statement it is. _XkbErrCode2(4, foo) means "this is the 4th error
* statement in this function". lovely.
*/
#define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff)))
#define _XkbErrCode3(a,b,c) _XkbErrCode2(a,(((unsigned int)(b))<<16)|(c))
#define _XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d)))
void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *); void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *);
void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd); void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd);