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

(submit/xkb-errmacro) xkb: move _XkbErrCode3() and _XkbErrCode4() 

These are only used inside xkb.c, nowhere else, so no need to
keep them in public header.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-03 13:46:24 +02:00
parent 9032c194aa
commit 8fa7192799
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/xkbsrv.h
View File

@ -304,8 +304,6 @@ extern _X_EXPORT CARD32 xkbDebugFlags;
* statement in this function". lovely. * statement in this function". lovely.
*/ */
#define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff))) #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

6
xkb/xkb.c
View File

@ -43,6 +43,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkb-procs.h" #include "xkb-procs.h"
#include "protocol-versions.h" #include "protocol-versions.h"
/* "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 _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)))
int XkbEventBase; int XkbEventBase;
static int XkbErrorBase; static int XkbErrorBase;