Commit 97d651fc authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Remove OS2PIPECONN transport

parent 0cbc8922
...@@ -115,7 +115,7 @@ static char *copystring (const char *src, int len) ...@@ -115,7 +115,7 @@ static char *copystring (const char *src, int len)
#ifdef UNIXCONN #ifdef UNIXCONN
# define UNIX_TRANS "unix" # define UNIX_TRANS "unix"
#endif #endif
#if defined(LOCALCONN) || defined(OS2PIPECONN) || defined(UNIXCONN) #if defined(LOCALCONN) || defined(UNIXCONN)
# define LOCAL_TRANS "local" # define LOCAL_TRANS "local"
#endif #endif
...@@ -502,7 +502,7 @@ _X11TransConnectDisplay ( ...@@ -502,7 +502,7 @@ _X11TransConnectDisplay (
#endif #endif
#if defined(TCPCONN) || defined(UNIXCONN) || defined(LOCALCONN) || defined(MNX_TCPCONN) || defined(OS2PIPECONN) #if defined(TCPCONN) || defined(UNIXCONN) || defined(LOCALCONN) || defined(MNX_TCPCONN)
if (!pprotocol) { if (!pprotocol) {
#if defined(UNIXCONN) #if defined(UNIXCONN)
if (phostname && (strcmp (phostname, "unix") == 0)) { if (phostname && (strcmp (phostname, "unix") == 0)) {
......
...@@ -11,7 +11,6 @@ HEADERS = \ ...@@ -11,7 +11,6 @@ HEADERS = \
Xtrans.c \ Xtrans.c \
Xtransint.h \ Xtransint.h \
Xtranslcl.c \ Xtranslcl.c \
Xtransos2.c \
Xtranssock.c \ Xtranssock.c \
Xtransutil.c \ Xtransutil.c \
transport.c transport.c
......
...@@ -94,9 +94,6 @@ Xtransport_table Xtransports[] = { ...@@ -94,9 +94,6 @@ Xtransport_table Xtransports[] = {
#endif /* !LOCALCONN */ #endif /* !LOCALCONN */
{ &TRANS(SocketUNIXFuncs), TRANS_SOCKET_UNIX_INDEX }, { &TRANS(SocketUNIXFuncs), TRANS_SOCKET_UNIX_INDEX },
#endif /* UNIXCONN */ #endif /* UNIXCONN */
#if defined(OS2PIPECONN)
{ &TRANS(OS2LocalFuncs), TRANS_LOCAL_LOCAL_INDEX },
#endif /* OS2PIPECONN */
#if defined(LOCALCONN) #if defined(LOCALCONN)
{ &TRANS(LocalFuncs), TRANS_LOCAL_LOCAL_INDEX }, { &TRANS(LocalFuncs), TRANS_LOCAL_LOCAL_INDEX },
#ifndef sun #ifndef sun
......
...@@ -159,13 +159,13 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp) ...@@ -159,13 +159,13 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp)
#endif /* defined(TCPCONN) */ #endif /* defined(TCPCONN) */
#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) #if defined(UNIXCONN) || defined(LOCALCONN)
case AF_UNIX: case AF_UNIX:
{ {
*familyp=FamilyLocal; *familyp=FamilyLocal;
break; break;
} }
#endif /* defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)*/ #endif /* defined(UNIXCONN) || defined(LOCALCONN)*/
#if (defined(__SCO__) || defined(__UNIXWARE__)) && defined(LOCALCONN) #if (defined(__SCO__) || defined(__UNIXWARE__)) && defined(LOCALCONN)
case 0: case 0:
...@@ -242,7 +242,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ciptr) ...@@ -242,7 +242,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ciptr)
switch (family) switch (family)
{ {
#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) #if defined(UNIXCONN) || defined(LOCALCONN)
case AF_UNIX: case AF_UNIX:
{ {
struct sockaddr_un *saddr = (struct sockaddr_un *) addr; struct sockaddr_un *saddr = (struct sockaddr_un *) addr;
...@@ -252,7 +252,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ciptr) ...@@ -252,7 +252,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ciptr)
hostnamebuf, saddr->sun_path); hostnamebuf, saddr->sun_path);
break; break;
} }
#endif /* defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) */ #endif /* defined(UNIXCONN) || defined(LOCALCONN) */
#if defined(TCPCONN) #if defined(TCPCONN)
case AF_INET: case AF_INET:
...@@ -332,14 +332,14 @@ TRANS(GetPeerNetworkId) (XtransConnInfo ciptr) ...@@ -332,14 +332,14 @@ TRANS(GetPeerNetworkId) (XtransConnInfo ciptr)
switch (family) switch (family)
{ {
case AF_UNSPEC: case AF_UNSPEC:
#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) #if defined(UNIXCONN) || defined(LOCALCONN)
case AF_UNIX: case AF_UNIX:
{ {
if (gethostname (addrbuf, sizeof (addrbuf)) == 0) if (gethostname (addrbuf, sizeof (addrbuf)) == 0)
addr = addrbuf; addr = addrbuf;
break; break;
} }
#endif /* defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) */ #endif /* defined(UNIXCONN) || defined(LOCALCONN) */
#if defined(TCPCONN) #if defined(TCPCONN)
case AF_INET: case AF_INET:
......
...@@ -64,9 +64,6 @@ from The Open Group. ...@@ -64,9 +64,6 @@ from The Open Group.
#ifdef LOCALCONN #ifdef LOCALCONN
#include "Xtranslcl.c" #include "Xtranslcl.c"
#endif #endif
#ifdef OS2PIPECONN
#include "Xtransos2.c"
#endif
#if defined(TCPCONN) || defined(UNIXCONN) #if defined(TCPCONN) || defined(UNIXCONN)
#include "Xtranssock.c" #include "Xtranssock.c"
#endif #endif
......
...@@ -1731,7 +1731,7 @@ ConvertAddr ( ...@@ -1731,7 +1731,7 @@ ConvertAddr (
switch (saddr->sa_family) switch (saddr->sa_family)
{ {
case AF_UNSPEC: case AF_UNSPEC:
#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) #if defined(UNIXCONN) || defined(LOCALCONN)
case AF_UNIX: case AF_UNIX:
#endif #endif
return FamilyLocal; return FamilyLocal;
......
...@@ -596,7 +596,7 @@ AuthAudit (ClientPtr client, Bool letin, ...@@ -596,7 +596,7 @@ AuthAudit (ClientPtr client, Bool letin,
switch (saddr->sa_family) switch (saddr->sa_family)
{ {
case AF_UNSPEC: case AF_UNSPEC:
#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) #if defined(UNIXCONN) || defined(LOCALCONN)
case AF_UNIX: case AF_UNIX:
#endif #endif
strcpy(out, "local host"); strcpy(out, "local host");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment