diff options
author | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
commit | c67a0f76ca34e441a817a7cdf261f496f3b3f2d6 (patch) | |
tree | c197b74a8c2f076aaa4f5506b90d6ad8e38b52b2 /X11/xtrans/Xtrans.c | |
parent | 8d07c58314685d56a0586d0a437b541ea2b92a54 (diff) | |
parent | 2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff) | |
download | vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.gz vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.bz2 vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'X11/xtrans/Xtrans.c')
-rw-r--r-- | X11/xtrans/Xtrans.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/X11/xtrans/Xtrans.c b/X11/xtrans/Xtrans.c index 1f37c4341..57a001a61 100644 --- a/X11/xtrans/Xtrans.c +++ b/X11/xtrans/Xtrans.c @@ -84,11 +84,6 @@ from The Open Group. static Xtransport_table Xtransports[] = { -#if defined(STREAMSCONN) - { &TRANS(TLITCPFuncs), TRANS_TLI_TCP_INDEX }, - { &TRANS(TLIINETFuncs), TRANS_TLI_INET_INDEX }, - { &TRANS(TLITLIFuncs), TRANS_TLI_TLI_INDEX }, -#endif /* STREAMSCONN */ #if defined(TCPCONN) { &TRANS(SocketTCPFuncs), TRANS_SOCKET_TCP_INDEX }, #if defined(IPv6) && defined(AF_INET6) |