(!1799) xkb: move XkbSLI_IsDefault() and XkbSLI_HasOwnState() into private header

These macros aren't used by any drivers, so no need to keep them exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Xi/exevents.c

@@ -98,6 +98,7 @@ SOFTWARE.
 #include "dix/input_priv.h"
 #include "dix/resource_priv.h"
 #include "mi/mi_priv.h"
+#include "xkb/xkbsrv_priv.h"
 
 #include "inputstr.h"
 #include "windowstr.h"
@@ -112,7 +113,6 @@ SOFTWARE.
 #include "xiquerydevice.h"      /* For List*Info */
 #include "eventstr.h"
 #include "inpututils.h"
-#include "xkbsrv.h"
 
 #define WID(w) ((w) ? ((w)->drawable.id) : 0)
 #define AllModifiersMask ( \

include/xkbsrv.h

@@ -168,9 +168,6 @@ typedef struct _XkbSrvInfo {
     char overlay_perkey_state[256/8]; /* bitfield */
 } XkbSrvInfoRec, *XkbSrvInfoPtr;
 
-#define	XkbSLI_IsDefault	(1L<<0)
-#define	XkbSLI_HasOwnState	(1L<<1)
-
 typedef struct _XkbSrvLedInfo {
     CARD16 flags;
     CARD16 class;

xkb/xkbsrv_priv.h

@@ -41,6 +41,9 @@
 #define XkbSetCauseXkbReq(c,e,cl)  XkbSetCauseReq(c,XkbReqCode,e,cl)
 #define XkbSetCauseUnknown(c)      XkbSetCauseKey(c,0,0)
 
+#define XkbSLI_IsDefault        (1L<<0)
+#define XkbSLI_HasOwnState      (1L<<1)
+
 void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *);
 
 void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd);