diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 08:34:17 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 08:34:17 +0200 |
commit | 320a8cc0c7fa472970bc3698c7e77b6406ca343b (patch) | |
tree | d13d3a78686c3d44fd4d89adfd1b57ddd4274533 /nx-X11/programs/Xserver/xkb | |
parent | 854f3fa49351ec72da432f195806162fcf5e5ddc (diff) | |
parent | b15fc63f4c0c4c741af1255d17907ba3b98b5cf9 (diff) | |
download | nx-libs-320a8cc0c7fa472970bc3698c7e77b6406ca343b.tar.gz nx-libs-320a8cc0c7fa472970bc3698c7e77b6406ca343b.tar.bz2 nx-libs-320a8cc0c7fa472970bc3698c7e77b6406ca343b.zip |
Merge branch 'sunweaver-pr/silencing-compiler-warnings' into 3.6.x
Attributes GH PR #168: https://github.com/ArcticaProject/nx-libs/pull/168
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Mon, 04 Jul 2016 11:15:20 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/xkb')
-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); |