diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 19:50:24 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 19:50:24 +0100 |
| commit | 107e72b038bc76953dc97d4ea655c9bde10e5865 (patch) | |
| tree | a5c7cd9dc1857fd972683481fa39f6eba685b32e /nx-X11/config/cf/X11.tmpl | |
| parent | a9b145d466f774d0a6948a493df2e9c7bff50d6f (diff) | |
| parent | 6a186b9217e0e3ca10f285f90e5afcdd22dc6c2e (diff) | |
| download | nx-libs-107e72b038bc76953dc97d4ea655c9bde10e5865.tar.gz nx-libs-107e72b038bc76953dc97d4ea655c9bde10e5865.tar.bz2 nx-libs-107e72b038bc76953dc97d4ea655c9bde10e5865.zip | |
Merge branch 'uli42-pr/upgrade_xtrans' into 3.6.x
Attributes GH PR #268: https://github.com/ArcticaProject/nx-libs/pull/268
Diffstat (limited to 'nx-X11/config/cf/X11.tmpl')
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 33d108d06..1942ca805 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -334,8 +334,7 @@ XORGRELSTRING = XorgManVersionString * NOTE: IPv6Flags could be tacked on to either ConnectionFlags or * ExtraConnectionDefs. Here, we choose the later in order to * maximise exposure of the IPv6 code (a number of <OS>.def files - * contain ConnectionFlags overrides). Mind you, this might not - * the right thing to do when HasStreams is asserted. + * contain ConnectionFlags overrides). */ #ifndef BuildIPv6 /* If the OS also #define's AF_INET6 */ #define BuildIPv6 YES @@ -355,19 +354,8 @@ XORGRELSTRING = XorgManVersionString #ifndef IPv6SocketsAlsoIPv4 #define IPv6SocketsAlsoIPv4 YES #endif -#ifndef DECnetFlags -#if HasDECnet -#define DECnetFlags -DDNETCONN -#else -#define DECnetFlags -#endif -#endif #ifndef ConnectionFlags -#if HasStreams -#define ConnectionFlags -DSTREAMSCONN -#else -#define ConnectionFlags -DTCPCONN -DUNIXCONN DECnetFlags -#endif +#define ConnectionFlags -DTCPCONN -DUNIXCONN #endif #if HasStickyDirBit STICKY_DEFINES = -DHAS_STICKY_DIR_BIT |