From 90612d25ca9a42a4f9bdea9dbd867abb635ba98f Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Wed, 2 Nov 2016 23:37:30 +0100
Subject: libX11 + Xserver: fix missing define warning

warning: "XTRANS_SEND_FDS" is not defined [-Wundef]

This define came in via the recent xtrans update.
---
 nx-X11/lib/X11/Imakefile             | 2 +-
 nx-X11/programs/Xserver/os/Imakefile | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'nx-X11')

diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 2f9535716..15097e716 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -157,7 +157,7 @@ EXTRA_LIBRARIES = /**/
 #endif
    CONN_DEFINES = $(CONNECTION_FLAGS)
    XTRANS_X_DEFINES = -DX11_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) -DXTRANS_SEND_FDS=0
-   XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES)
+   XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) -DXTRANS_SEND_FDS=0
 #if HasBSD44Sockets
    SOCK_DEFINES = -DBSD44SOCKETS
 #endif
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile
index e78b422ab..d381ac272 100644
--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -135,10 +135,13 @@ BOOTSTRAPCFLAGS =
 #if HasPam && HasPamMisc
     PAM_DEFINES = -DUSE_PAM
 #endif
+ XTRANS_DEFINES = -DXTRANS_SEND_FDS=0
+
         DEFINES = $(CONNECTION_FLAGS) $(MEM_DEFINES) \
 		  $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) \
 		  $(RGB_DEFINES) $(GETPEER_DEFINES) \
-		  $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES) $(NX_DEFINES)
+		  $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES) \
+		  $(XTRANS_DEFINES) $(NX_DEFINES)
        INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
 		  -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \
 		  -I$(TOP)/lib/Xau $(NX_INCLUDES) \
-- 
cgit v1.2.3