[X2Go-Commits] [x2gokdrive] 03/04: x2gokdriveinit.c: Only provide KDRIVE_EVDEV code for builds against X.Org server << 1.19.99.901.
git-admin at x2go.org
git-admin at x2go.org
Mon Jul 15 22:09:24 CEST 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gokdrive.
commit 0e847566bbdc70780cd556216f229819be1d5d61
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jul 15 21:22:32 2019 +0200
x2gokdriveinit.c: Only provide KDRIVE_EVDEV code for builds against X.Org server << 1.19.99.901.
---
x2gokdriveinit.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c
index 1c20bbe..6a3f615 100644
--- a/x2gokdriveinit.c
+++ b/x2gokdriveinit.c
@@ -41,11 +41,12 @@ extern Bool EphyrWantNoHostGrab;
extern Bool kdHasPointer;
extern Bool kdHasKbd;
-
+#if XORG_VERSION_CURRENT < 11999901
#ifdef KDRIVE_EVDEV
extern KdPointerDriver LinuxEvdevMouseDriver;
extern KdKeyboardDriver LinuxEvdevKeyboardDriver;
-#endif
+#endif /* KDRIVE_EVDEV */
+#endif /* XORG_VERSION_CURRENT */
void processScreenOrOutputArg(const char *screen_size, const char *output, char *parent_id);
void processOutputArg(const char *output, char *parent_id);
@@ -104,10 +105,12 @@ InitInput(int argc, char **argv)
KdKeyboardInfo *ki;
KdPointerInfo *pi;
+#if XORG_VERSION_CURRENT < 11999901
#ifdef KDRIVE_EVDEV
KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver);
KdAddPointerDriver(&LinuxEvdevMouseDriver);
-#endif
+#endif /* KDRIVE_EVDEV */
+#endif /* XORG_VERSION_CURRENT */
if (!SeatId) {
KdAddKeyboardDriver(&EphyrKeyboardDriver);
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
More information about the x2go-commits
mailing list