diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-20 10:31:24 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-20 10:31:24 +0200 |
commit | 61b8d44f1f76df5abb9e53427f07e9f1ad987e32 (patch) | |
tree | f0f84ebfb28ec44254def01211eeca94c76aeed4 /nx-X11/programs/Xserver/dix/devices.c | |
parent | da01dc8da1aedb1f75d62c03748a239c54b14483 (diff) | |
parent | 50eb5e4a9bf812895a7d5c4e6ae0775c6910931f (diff) | |
download | nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.tar.gz nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.tar.bz2 nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.zip |
Merge branch 'uli42-pr/fix_compile_warnings' into 3.6.x
Attributes GH PR #230: https://github.com/ArcticaProject/nx-libs/pull/230
Diffstat (limited to 'nx-X11/programs/Xserver/dix/devices.c')
-rw-r--r-- | nx-X11/programs/Xserver/dix/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 39f5d123f..69cdc82e1 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -725,7 +725,7 @@ InitStringFeedbackClassDeviceStruct ( for (i=0; i<num_symbols_supported; i++) *(feedc->ctrl.symbols_supported+i) = *symbols++; for (i=0; i<max_symbols; i++) - *(feedc->ctrl.symbols_displayed+i) = (KeySym) NULL; + *(feedc->ctrl.symbols_displayed+i) = (KeySym) 0; feedc->ctrl.id = 0; if ( (feedc->next = dev->stringfeed) ) feedc->ctrl.id = dev->stringfeed->ctrl.id + 1; |