diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-03 09:36:23 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-03 09:36:23 +0100 |
| commit | d12b77543c613bff03014094c44726eddbdf5ae7 (patch) | |
| tree | 16b0ad5c00d6bde479f3331d434cca39bcde22ab /nx-X11/programs/Xserver/os | |
| parent | 8dc0d18c15f003703f09124e0fe6fd497f388683 (diff) | |
| parent | 47fab08aa68367734dc4cdf66dfb29ed086947e7 (diff) | |
| download | nx-libs-d12b77543c613bff03014094c44726eddbdf5ae7.tar.gz nx-libs-d12b77543c613bff03014094c44726eddbdf5ae7.tar.bz2 nx-libs-d12b77543c613bff03014094c44726eddbdf5ae7.zip | |
Merge branch 'uli42-pr/libX11_xtrans_silence_compiler_warnings' into 3.6.x
Attributes GH PR #278: https://github.com/ArcticaProject/nx-libs/pull/278
Diffstat (limited to 'nx-X11/programs/Xserver/os')
| -rw-r--r-- | nx-X11/programs/Xserver/os/Imakefile | 5 |
1 files changed, 4 insertions, 1 deletions
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) \ |