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/lib/X11 | |
| 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/lib/X11')
| -rw-r--r-- | nx-X11/lib/X11/Imakefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index e52e429c4..15097e716 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -156,8 +156,8 @@ EXTRA_LIBRARIES = /**/ POLL_DEFINES = -DUSE_POLL #endif CONN_DEFINES = $(CONNECTION_FLAGS) - XTRANS_X_DEFINES = -DX11_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) - XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) + XTRANS_X_DEFINES = -DX11_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) -DXTRANS_SEND_FDS=0 + XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) -DXTRANS_SEND_FDS=0 #if HasBSD44Sockets SOCK_DEFINES = -DBSD44SOCKETS #endif |