diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2016-06-29 15:02:00 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 08:20:38 +0200 |
| commit | d60297e41fd4d0c0fcbe67b434f635a0f6487f05 (patch) | |
| tree | 7b6bb444c48a813d2f76ae664bb03cc2dc19a2cb | |
| parent | ecaf4df7f2f3bcefd22e62702a40103ad31d02e1 (diff) | |
| download | nx-libs-d60297e41fd4d0c0fcbe67b434f635a0f6487f05.tar.gz nx-libs-d60297e41fd4d0c0fcbe67b434f635a0f6487f05.tar.bz2 nx-libs-d60297e41fd4d0c0fcbe67b434f635a0f6487f05.zip | |
Remove INITARGS braindamage, change to void; add XkbExtensionInit prototype to xkb.h. Explicitly initialise nTypes in xkb.c.
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkb.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkb.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 6c6e67f1e..65a4c3747 100644 --- 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; diff --git a/nx-X11/programs/Xserver/xkb/xkb.h b/nx-X11/programs/Xserver/xkb/xkb.h index 3a8a49541..aa2a97e18 100644 --- 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); |