XKB: Make XKB mandatory

No more #ifdef XKB, because you can't disable the build, and no more
noXkbExtension either.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

9 files changed, 0 insertions, 52 deletions

diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index e1d226c84..1af477def 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -315,15 +315,6 @@
 /* Support Xinerama extension */
 #undef XINERAMA
 
-/* Build XKB */
-#undef XKB
-
-/* Enable XKB per default */
-#undef XKB_DFLT_DISABLED
-
-/* Build XKB server */
-#undef XKB_IN_SERVER
-
 /* Vendor release */
 #undef XORG_RELEASE
 
diff --git a/include/dix.h b/include/dix.h
index 4aa03c2f5..b21084607 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -408,11 +408,9 @@ extern _X_EXPORT void DeliverGrabbedEvent(
     Bool /* deactivateGrab */,
     int /* count */);
 
-#ifdef XKB
 extern _X_EXPORT void FixKeyState(
     xEvent * /* xE */,
     DeviceIntPtr /* keybd */);
-#endif /* XKB */
 
 extern _X_EXPORT void RecalculateDeliverableEvents(
     WindowPtr /* pWin */);
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 4ca061b09..8bafcde0e 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -112,13 +112,11 @@ typedef struct _Client {
     int		priority;
     ClientState clientState;
     PrivateRec	*devPrivates;
-#ifdef XKB
     unsigned short	xkbClientFlags;
     unsigned short	mapNotifyMask;
     unsigned short	newKeyboardNotifyMask;
     unsigned short	vMajor,vMinor;
     KeyCode		minKC,maxKC;
-#endif
 
 #ifdef DEBUG
     unsigned char requestLog[MAX_REQUEST_LOG];
diff --git a/include/globals.h b/include/globals.h
index e70e7c69e..5ac3905d0 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -114,11 +114,6 @@ extern _X_EXPORT Bool noXFree86VidModeExtension;
 extern _X_EXPORT Bool noXFixesExtension;
 #endif
 
-#ifdef XKB
-/* noXkbExtension is defined in xkb/xkbInit.c */
-extern _X_EXPORT Bool noXkbExtension;
-#endif
-
 #ifdef PANORAMIX
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif
diff --git a/include/input.h b/include/input.h
index 2dd29f8e9..cf546e076 100644
--- a/include/input.h
+++ b/include/input.h
@@ -409,7 +409,6 @@ extern _X_EXPORT void ProcessKeyboardEvent(
     DeviceIntPtr /*keybd*/,
     int /*count*/);
 
-#ifdef XKB
 extern _X_EXPORT void CoreProcessPointerEvent(
     xEventPtr /*xE*/,
     DeviceIntPtr /*mouse*/,
@@ -419,7 +418,6 @@ extern _X_EXPORT _X_DEPRECATED void CoreProcessKeyboardEvent(
     xEventPtr /*xE*/,
     DeviceIntPtr /*keybd*/,
     int /*count*/) _X_DEPRECATED;
-#endif
 
 extern _X_EXPORT Bool LegalModifier(
     unsigned int /*key*/, 
diff --git a/include/inputstr.h b/include/inputstr.h
index bcfc09ed9..d1a965b28 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -144,11 +144,7 @@ typedef struct _KeyClassRec {
     CARD8		maxKeysPerModifier;
     unsigned short	state;
     unsigned short	prev_state;
-#ifdef XKB
     struct _XkbSrvInfo *xkbInfo;
-#else
-    void               *pad0;
-#endif
 } KeyClassRec, *KeyClassPtr;
 
 typedef struct _AxisInfo {
@@ -192,11 +188,7 @@ typedef struct _ButtonClassRec {
     Mask		motionMask;
     CARD8		down[DOWN_LENGTH];
     CARD8		map[MAP_LENGTH];
-#ifdef XKB
     union _XkbAction    *xkb_acts;
-#else
-    void                *pad0;
-#endif
 } ButtonClassRec, *ButtonClassPtr;
 
 typedef struct _FocusClassRec {
@@ -244,11 +236,7 @@ typedef struct _KbdFeedbackClassRec {
     KbdCtrlProcPtr	CtrlProc;
     KeybdCtrl	 	ctrl;
     KbdFeedbackPtr	next;
-#ifdef XKB
     struct _XkbSrvLedInfo *xkb_sli;
-#else
-    void                *pad0;
-#endif
 } KbdFeedbackClassRec;
 
 typedef struct _PtrFeedbackClassRec {
@@ -280,11 +268,7 @@ typedef struct _LedFeedbackClassRec {
     LedCtrlProcPtr	CtrlProc;
     LedCtrl	 	ctrl;
     LedFeedbackPtr	next;
-#ifdef XKB
     struct _XkbSrvLedInfo *xkb_sli;
-#else
-    void                *pad0;
-#endif
 } LedFeedbackClassRec;
 
 
@@ -446,11 +430,7 @@ typedef struct _DeviceIntRec {
     StringFeedbackPtr	stringfeed;
     BellFeedbackPtr	bell;
     LedFeedbackPtr	leds;
-#ifdef XKB
     struct _XkbInterest *xkb_interest;
-#else
-    void                *pad0;
-#endif
     char                *config_info; /* used by the hotplug layer */
     PrivateRec		*devPrivates;
     int			nPrivates;
diff --git a/include/site.h b/include/site.h
index fec87070b..c07cbbfe6 100644
--- a/include/site.h
+++ b/include/site.h
@@ -90,11 +90,7 @@ SOFTWARE.
 #define DEFAULT_BELL		50
 #define DEFAULT_BELL_PITCH	400
 #define DEFAULT_BELL_DURATION	100
-#ifdef XKB
 #define DEFAULT_AUTOREPEAT	TRUE
-#else
-#define DEFAULT_AUTOREPEAT	FALSE
-#endif
 #define DEFAULT_AUTOREPEATS	{\
         0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\
         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index c6f6e9e32..af87d8fa5 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -295,8 +295,6 @@ extern _X_EXPORT int	XkbKeyboardErrorCode;
 extern _X_EXPORT char *	XkbBaseDirectory;
 extern _X_EXPORT char *	XkbBinDirectory;
 
-extern _X_EXPORT Bool	noXkbExtension;
-
 extern _X_EXPORT pointer	XkbLastRepeatEvent;
 
 extern _X_EXPORT CARD32	xkbDebugFlags;
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 57b8a82a2..ca6aec2b6 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -103,15 +103,9 @@
 /* Build XKB */
 #undef XKB
 
-/* Enable XKB per default */
-#undef XKB_DFLT_DISABLED
-
 /* XKB default rules */
 #undef XKB_DFLT_RULES
 
-/* Build XKB support in server */
-#undef XKB_IN_SERVER
-
 /* Support loadable input and output drivers */
 #undef XLOADABLE