Remove INITARGS braindamage, change to void; add XkbExtensionInit prototype to…

Remove INITARGS braindamage, change to void; add XkbExtensionInit prototype to xkb.h. Explicitly initialise nTypes in xkb.c.

Remove INITARGS braindamage, change to void; add XkbExtensionInit prototype to…
d60297e4 · Daniel Stone · Mike Gabriel · ecaf4df7 · d60297e4 · d60297e4
Commit d60297e4 authored Jun 29, 2016 by Daniel Stone Committed by Mike Gabriel Jul 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

xkb.c nx-X11/programs/Xserver/xkb/xkb.c +2 -2

xkb.h nx-X11/programs/Xserver/xkb/xkb.h +2 -0

No files found.
--- a/nx-X11/programs/Xserver/xkb/xkb.c
+++ b/nx-X11/programs/Xserver/xkb/xkb.c
@@ -2277,7 +2277,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];
@@ -6200,7 +6200,7 @@ XkbResetProc(ExtensionEntry *extEntry)
 }

 void
-XkbExtensionInit(INITARGS)
+XkbExtensionInit(void)
 {
    ExtensionEntry *extEntry;


--- a/nx-X11/programs/Xserver/xkb/xkb.h
+++ b/nx-X11/programs/Xserver/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);