diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-28 00:55:13 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-28 00:55:13 +0100 |
| commit | 1918bcb9c01fcf45727b514afb8ca8d978a2bf93 (patch) | |
| tree | a678fc2c488d1f8121cc736575e682541f465e95 /nx-X11/programs/Xserver/xkb/ddxKillSrv.c | |
| parent | a6cb8583adb16f299e968be4a8e99e903966e1d8 (diff) | |
| parent | 00e3e95e5f40de2aaf5bb920bc51a311404889fc (diff) | |
| download | nx-libs-1918bcb9c01fcf45727b514afb8ca8d978a2bf93.tar.gz nx-libs-1918bcb9c01fcf45727b514afb8ca8d978a2bf93.tar.bz2 nx-libs-1918bcb9c01fcf45727b514afb8ca8d978a2bf93.zip | |
Merge branch 'uli42-pr/update_xkb' into 3.6.x
Attributes GH PR #648: https://github.com/ArcticaProject/nx-libs/pull/648
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/ddxKillSrv.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/ddxKillSrv.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c index b61c4529b..c581d4201 100644 --- a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c +++ b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c @@ -42,25 +42,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <xkbsrv.h> #include <nx-X11/extensions/XI.h> -#ifdef XF86DDXACTIONS -#include "xf86.h" -#endif - int XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act) { -#ifdef NXAGENT_SERVER - - return 0; - -#else - -#ifdef XF86DDXACTIONS - xf86ProcessActionEvent(ACTION_TERMINATE, NULL); -#else +#ifndef NXAGENT_SERVER GiveUp(1); -#endif - return 0; - #endif /* NXAGENT_SERVER */ + return 0; } |