xkb: move _XkbLibError macro into private header

It's only used internally in xkb.

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

include/xkbsrv.h

@@ -259,8 +259,6 @@ extern _X_EXPORT const char *XkbBinDirectory;
 
 extern _X_EXPORT CARD32 xkbDebugFlags;
 
-#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.

xkb/xkbout.c

@@ -37,14 +37,13 @@
 
 #include "xkb/xkbfmisc_priv.h"
 #include "xkb/xkbout_priv.h"
+#include "xkb/xkbsrv_priv.h"
 #include "xkb/xkbtext_priv.h"
 
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
 #include "xkbstr.h"
-#include <xkbsrv.h>
-
 #include "xkbgeom.h"
 
 #define	VMOD_HIDE_VALUE	0

xkb/xkbsrv_priv.h

@@ -56,6 +56,8 @@
  */
 #define _XkbStateNotifyInProgress       (1<<0)
 
+#define _XkbLibError(c,l,d)     /* Epoch fail */
+
 void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *);
 
 void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd);

xkb/xkmread.c

@@ -36,11 +36,11 @@
 
 #include "xkb/xkbfile_priv.h"
 #include "xkb/xkbfmisc_priv.h"
+#include "xkb/xkbsrv_priv.h"
 
 #include "misc.h"
 #include "inputstr.h"
 #include "xkbstr.h"
-#include "xkbsrv.h"
 #include "xkbgeom.h"
 
 static Atom