From 00ebfaf535801a8600ac48319b43b9c28e5f6749 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 29 Jun 2016 13:33:51 +0200
Subject: Xserver/os/connection.c: Only define XSERV_t, TRANS_SERVER and
 TRANS_REOPEN if not yet defined.

---
 nx-X11/programs/Xserver/os/connection.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'nx-X11/programs/Xserver/os/connection.c')

diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c
index fd9741389..c1749d26a 100644
--- a/nx-X11/programs/Xserver/os/connection.c
+++ b/nx-X11/programs/Xserver/os/connection.c
@@ -72,9 +72,15 @@ SOFTWARE.
 #endif
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
-#define XSERV_t
-#define TRANS_SERVER
-#define TRANS_REOPEN
+#ifndef XSERV_t
+# define XSERV_t
+#endif
+#ifndef TRANS_SERVER
+# define TRANS_SERVER
+#endif
+#ifndef TRANS_REOPEN
+# define TRANS_REOPEN
+#endif
 #include <nx-X11/Xtrans/Xtrans.h>
 #include <errno.h>
 #include <signal.h>
-- 
cgit v1.2.3


From bad0e8bdd32bf8bc741ad64a37a9318655f26068 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 29 Jun 2016 13:35:06 +0200
Subject: Xserver/os/connection.c: Drop unused variable 'restore_trans_conn'
 from ClientAuthorized().

---
 nx-X11/programs/Xserver/os/connection.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nx-X11/programs/Xserver/os/connection.c')

diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c
index c1749d26a..78ed47f1d 100644
--- a/nx-X11/programs/Xserver/os/connection.c
+++ b/nx-X11/programs/Xserver/os/connection.c
@@ -688,7 +688,6 @@ ClientAuthorized(ClientPtr client,
     XID	 		auth_id;
     char	 	*reason = NULL;
     XtransConnInfo	trans_conn;
-    int			restore_trans_conn = 0;
 
     priv = (OsCommPtr)client->osPrivate;
     trans_conn = priv->trans_conn;
-- 
cgit v1.2.3