From b3570dd94aa72f94e537a17680150e91e7712f5a Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sat, 25 Mar 2006 22:37:58 +0000
Subject: [PATCH] Remove INITARGS braindamage, change to void; add
 XkbExtensionInit prototype     to xkb.h. Explicitly initialise nTypes in
 xkb.c.

---
 ChangeLog | 6 ++++++
 xkb/xkb.c | 4 ++--
 xkb/xkb.h | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3b3e1372..ae2f9e65c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,12 @@
 	* xkb/xkbInit.c:
 	Remove weirdo XkbCF pre-configuration code.
 
+	* xkb/xkb.h:
+	* xkb/xkb.c:
+	Remove INITARGS braindamage, change to void; add XkbExtensionInit
+	prototype to xkb.h.
+	Explicitly initialise nTypes in xkb.c.
+
 2006-03-25  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/xfree86/common/xf86Bus.c:
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 240509079..3cdf4d124 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -2284,7 +2284,7 @@ ProcXkbSetMap(ClientPtr client)
     XkbDescPtr		xkb;
     XkbChangesRec	change;
     XkbEventCauseRec	cause;
-    int			nTypes,nActions,error;
+    int			nTypes = 0,nActions,error;
     char *		tmp;
     CARD8	 	mapWidths[XkbMaxLegalKeyCode+1];
     CARD16	 	symsPerKey[XkbMaxLegalKeyCode+1];
@@ -6214,7 +6214,7 @@ XkbResetProc(ExtensionEntry *extEntry)
 }
 
 void
-XkbExtensionInit(INITARGS)
+XkbExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 
diff --git a/xkb/xkb.h b/xkb/xkb.h
index 704cd49c0..156608ef0 100644
--- a/xkb/xkb.h
+++ b/xkb/xkb.h
@@ -32,6 +32,8 @@ extern int ProcXkbSetDebuggingFlags(ClientPtr client);
 extern int XkbSetRepeatRate(DeviceIntPtr dev, int timeout, int interval, int major, int minor);
 extern int XkbGetRepeatRate(DeviceIntPtr dev, int *timeout, int *interval);
 
+extern void XkbExtensionInit(void);
+
 extern Status XkbComputeGetIndicatorMapReplySize(
     XkbIndicatorPtr             indicators,
     xkbGetIndicatorMapReply     *rep);