aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/connection.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-05 08:34:17 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-05 08:34:17 +0200
commit320a8cc0c7fa472970bc3698c7e77b6406ca343b (patch)
treed13d3a78686c3d44fd4d89adfd1b57ddd4274533 /nx-X11/programs/Xserver/os/connection.c
parent854f3fa49351ec72da432f195806162fcf5e5ddc (diff)
parentb15fc63f4c0c4c741af1255d17907ba3b98b5cf9 (diff)
downloadnx-libs-320a8cc0c7fa472970bc3698c7e77b6406ca343b.tar.gz
nx-libs-320a8cc0c7fa472970bc3698c7e77b6406ca343b.tar.bz2
nx-libs-320a8cc0c7fa472970bc3698c7e77b6406ca343b.zip
Merge branch 'sunweaver-pr/silencing-compiler-warnings' into 3.6.x
Attributes GH PR #168: https://github.com/ArcticaProject/nx-libs/pull/168 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Mon, 04 Jul 2016 11:15:20 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/os/connection.c')
-rw-r--r--nx-X11/programs/Xserver/os/connection.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c
index fd9741389..78ed47f1d 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>
@@ -682,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;