aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-11-02 23:37:30 +0100
committerUlrich Sibiller <uli42@gmx.de>2016-11-03 00:10:33 +0100
commit90612d25ca9a42a4f9bdea9dbd867abb635ba98f (patch)
treea752f463bf5d93571461a9c93a39852c34be5155
parent2631603b60ae8142e2a61a5d3a3b8b7be6d9a737 (diff)
downloadnx-libs-90612d25ca9a42a4f9bdea9dbd867abb635ba98f.tar.gz
nx-libs-90612d25ca9a42a4f9bdea9dbd867abb635ba98f.tar.bz2
nx-libs-90612d25ca9a42a4f9bdea9dbd867abb635ba98f.zip
libX11 + Xserver: fix missing define warning
warning: "XTRANS_SEND_FDS" is not defined [-Wundef] This define came in via the recent xtrans update.
-rw-r--r--nx-X11/lib/X11/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/os/Imakefile5
2 files changed, 5 insertions, 2 deletions
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) \