aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/xkb/ddxKillSrv.c
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/ddxKillSrv.c')
-rw-r--r--nx-X11/programs/Xserver/xkb/ddxKillSrv.c18
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;
}