[X2Go-Commits] [x2gokdrive] 04/04: x2gokdrive*.c: Include kdrive-config.h when building against X.Org server before 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 b70a5a58a2009925e18b2122d4027415fa25f2e4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 15 21:47:04 2019 +0200

    x2gokdrive*.c: Include kdrive-config.h when building against X.Org server before 1.19.99.901.
---
 remote.c              | 5 +++++
 x2gokdrive.c          | 5 +++++
 x2gokdrivecursor.c    | 5 +++++
 x2gokdriveinit.c      | 5 +++++
 x2gokdriveselection.c | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/remote.c b/remote.c
index cfbef1b..9bbd4ac 100644
--- a/remote.c
+++ b/remote.c
@@ -28,6 +28,11 @@
 
 #ifdef HAVE_CONFIG_H
 #include <dix-config.h>
+
+#if XORG_VERSION_CURRENT < 11999901
+#include <kdrive-config.h>
+#endif /* XORG_VERSION_CURRENT */
+
 #endif
 #include "remote.h"
 
diff --git a/x2gokdrive.c b/x2gokdrive.c
index 38ecc6a..004a3dd 100644
--- a/x2gokdrive.c
+++ b/x2gokdrive.c
@@ -29,6 +29,11 @@
 
 #ifdef HAVE_CONFIG_H
 #include <dix-config.h>
+
+#if XORG_VERSION_CURRENT < 11999901
+#include <kdrive-config.h>
+#endif /* XORG_VERSION_CURRENT */
+
 #endif
 
 #include <xcb/xcb_keysyms.h>
diff --git a/x2gokdrivecursor.c b/x2gokdrivecursor.c
index a9a3388..e491f34 100644
--- a/x2gokdrivecursor.c
+++ b/x2gokdrivecursor.c
@@ -27,6 +27,11 @@
 
 #ifdef HAVE_CONFIG_H
 #include <dix-config.h>
+
+#if XORG_VERSION_CURRENT < 11999901
+#include <kdrive-config.h>
+#endif /* XORG_VERSION_CURRENT */
+
 #endif
 #include "x2gokdrive.h"
 #include "x2gokdrivelog.h"
diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c
index 6a3f615..b7b3767 100644
--- a/x2gokdriveinit.c
+++ b/x2gokdriveinit.c
@@ -28,6 +28,11 @@
 
 #ifdef HAVE_CONFIG_H
 #include <dix-config.h>
+
+#if XORG_VERSION_CURRENT < 11999901
+#include <kdrive-config.h>
+#endif /* XORG_VERSION_CURRENT */
+
 #endif
 #include "x2gokdrive.h"
 #include "x2gokdrivelog.h"
diff --git a/x2gokdriveselection.c b/x2gokdriveselection.c
index 2da604b..adb3095 100644
--- a/x2gokdriveselection.c
+++ b/x2gokdriveselection.c
@@ -27,6 +27,11 @@
 
 #ifdef HAVE_CONFIG_H
 #include <dix-config.h>
+
+#if XORG_VERSION_CURRENT < 11999901
+#include <kdrive-config.h>
+#endif /* XORG_VERSION_CURRENT */
+
 #endif
 
 #include "x2gokdriveselection.h"

--
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