diff --git a/os/Xtrans.c b/os/Xtrans.c index b7e0eb442..e0187f0f4 100644 --- a/os/Xtrans.c +++ b/os/Xtrans.c @@ -471,9 +471,6 @@ TRANS(Open) (int type, const char *address) return ciptr; } - -#ifdef TRANS_REOPEN - /* * We might want to create an XtransConnInfo object based on a previously * opened connection. For example, the font server may clone itself and @@ -540,10 +537,6 @@ TRANS(Reopen) (int type, int trans_id, int fd, const char *port) return ciptr; } -#endif /* TRANS_REOPEN */ - - - /* * These are the public interfaces to this Transport interface. * These are the only functions that should have knowledge of the transport @@ -570,8 +563,6 @@ TRANS(OpenCOTSServer) (const char *address) return TRANS(Open) (XTRANS_OPEN_COTS_SERVER, address); } -#ifdef TRANS_REOPEN - XtransConnInfo TRANS(ReopenCOTSServer) (int trans_id, int fd, const char *port) @@ -602,9 +593,6 @@ TRANS(GetReopenInfo) (XtransConnInfo ciptr, return 0; } -#endif /* TRANS_REOPEN */ - - int TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg) diff --git a/os/Xtrans.h b/os/Xtrans.h index 9ebe16744..cf4172ed7 100644 --- a/os/Xtrans.h +++ b/os/Xtrans.h @@ -209,8 +209,6 @@ XtransConnInfo TRANS(OpenCOTSServer)( const char * /* address */ ); -#ifdef TRANS_REOPEN - XtransConnInfo TRANS(ReopenCOTSServer)( int, /* trans_id */ int, /* fd */ @@ -224,9 +222,6 @@ int TRANS(GetReopenInfo)( char ** /* port */ ); -#endif /* TRANS_REOPEN */ - - int TRANS(SetOption)( XtransConnInfo, /* ciptr */ int, /* option */ diff --git a/os/Xtransint.h b/os/Xtransint.h index 6927b741f..4437da16b 100644 --- a/os/Xtransint.h +++ b/os/Xtransint.h @@ -154,17 +154,12 @@ typedef struct _Xtransport { const char * /* port */ ); -#ifdef TRANS_REOPEN - XtransConnInfo (*ReopenCOTSServer)( struct _Xtransport *, /* transport */ int, /* fd */ const char * /* port */ ); -#endif /* TRANS_REOPEN */ - - int (*SetOption)( XtransConnInfo, /* connection */ int, /* option */ diff --git a/os/Xtranslcl.c b/os/Xtranslcl.c index 063612fce..d3b0c5793 100644 --- a/os/Xtranslcl.c +++ b/os/Xtranslcl.c @@ -116,8 +116,6 @@ TRANS(OpenFail)(XtransConnInfo ciptr _X_UNUSED, const char *port _X_UNUSED) return -1; } -#ifdef TRANS_REOPEN - static int TRANS(ReopenFail)(XtransConnInfo ciptr _X_UNUSED, int fd _X_UNUSED, const char *port _X_UNUSED) @@ -126,8 +124,6 @@ TRANS(ReopenFail)(XtransConnInfo ciptr _X_UNUSED, int fd _X_UNUSED, return 0; } -#endif /* TRANS_REOPEN */ - #if XTRANS_SEND_FDS static int TRANS(LocalRecvFdInvalid)(XtransConnInfo ciptr) @@ -482,17 +478,6 @@ TRANS(NAMEDAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status) #endif /* LOCAL_TRANS_NAMED */ - - - - - - - - - -#ifdef TRANS_REOPEN - #ifdef LOCAL_TRANS_NAMED static int @@ -534,12 +519,6 @@ TRANS(NAMEDReopenServer)(XtransConnInfo ciptr, int fd _X_UNUSED, const char *por #endif /* LOCAL_TRANS_NAMED */ - - -#endif /* TRANS_REOPEN */ - - - /* * This table contains all of the entry points for the different local * connection mechanisms. @@ -572,8 +551,6 @@ typedef struct _LOCALtrans2dev { XtransConnInfo, const char * /*port*/ ); -#ifdef TRANS_REOPEN - int (*devcotsreopenserver)( XtransConnInfo, int, /* fd */ @@ -586,8 +563,6 @@ typedef struct _LOCALtrans2dev { const char * /* port */ ); -#endif /* TRANS_REOPEN */ - int (*devreset)( XtransConnInfo /* ciptr */ ); @@ -608,10 +583,8 @@ static LOCALtrans2dev LOCALtrans2devtab[] = { TRANS(OpenFail), #endif /* TRANS_CLIENT */ TRANS(OpenFail), -#ifdef TRANS_REOPEN TRANS(NAMEDReopenServer), TRANS(ReopenFail), -#endif TRANS(NAMEDResetListener), TRANS(NAMEDAccept) }, @@ -625,10 +598,8 @@ static LOCALtrans2dev LOCALtrans2devtab[] = { TRANS(OpenFail), #endif /* TRANS_CLIENT */ TRANS(OpenFail), -#ifdef TRANS_REOPEN TRANS(NAMEDReopenServer), TRANS(ReopenFail), -#endif TRANS(NAMEDResetListener), TRANS(NAMEDAccept) }, @@ -643,10 +614,8 @@ static LOCALtrans2dev LOCALtrans2devtab[] = { TRANS(OpenFail), #endif /* TRANS_CLIENT */ TRANS(OpenFail), -#ifdef TRANS_REOPEN TRANS(NAMEDReopenServer), TRANS(ReopenFail), -#endif TRANS(NAMEDResetListener), TRANS(NAMEDAccept) }, @@ -660,10 +629,8 @@ static LOCALtrans2dev LOCALtrans2devtab[] = { TRANS(OpenFail), #endif /* TRANS_CLIENT */ TRANS(OpenFail), -#ifdef TRANS_REOPEN TRANS(NAMEDReopenServer), TRANS(ReopenFail), -#endif TRANS(NAMEDResetListener), TRANS(NAMEDAccept) }, @@ -931,8 +898,6 @@ TRANS(LocalOpenServer)(int type, const char *protocol, return NULL; } -#ifdef TRANS_REOPEN - static XtransConnInfo TRANS(LocalReopenServer)(int type, int index, int fd, const char *port) @@ -972,10 +937,6 @@ TRANS(LocalReopenServer)(int type, int index, int fd, const char *port) return NULL; } -#endif /* TRANS_REOPEN */ - - - /* * This is the Local implementation of the X Transport service layer */ @@ -1039,8 +1000,6 @@ TRANS(LocalOpenCOTSServer)(Xtransport *thistrans, const char *protocol, return TRANS(LocalOpenServer)(XTRANS_OPEN_COTS_SERVER, protocol, host, port); } -#ifdef TRANS_REOPEN - static XtransConnInfo TRANS(LocalReopenCOTSServer)(Xtransport *thistrans, int fd, const char *port) @@ -1065,10 +1024,6 @@ TRANS(LocalReopenCOTSServer)(Xtransport *thistrans, int fd, const char *port) index, fd, port); } -#endif /* TRANS_REOPEN */ - - - static int TRANS(LocalSetOption)(XtransConnInfo ciptr, int option, int arg) @@ -1271,9 +1226,7 @@ static Xtransport TRANS(LocalFuncs) = { #endif /* TRANS_CLIENT */ local_aliases, TRANS(LocalOpenCOTSServer), -#ifdef TRANS_REOPEN TRANS(LocalReopenCOTSServer), -#endif TRANS(LocalSetOption), TRANS(LocalCreateListener), TRANS(LocalResetListener), @@ -1307,9 +1260,7 @@ static Xtransport TRANS(NAMEDFuncs) = { #endif /* TRANS_CLIENT */ NULL, TRANS(LocalOpenCOTSServer), -#ifdef TRANS_REOPEN TRANS(LocalReopenCOTSServer), -#endif TRANS(LocalSetOption), TRANS(LocalCreateListener), TRANS(LocalResetListener), @@ -1340,9 +1291,7 @@ static Xtransport TRANS(PIPEFuncs) = { #endif /* TRANS_CLIENT */ NULL, TRANS(LocalOpenCOTSServer), -#ifdef TRANS_REOPEN TRANS(LocalReopenCOTSServer), -#endif TRANS(LocalSetOption), TRANS(LocalCreateListener), TRANS(LocalResetListener), @@ -1364,5 +1313,3 @@ static Xtransport TRANS(PIPEFuncs) = { TRANS(LocalCloseForCloning), }; #endif /* LOCAL_TRANS_NAMED */ - - diff --git a/os/Xtranssock.c b/os/Xtranssock.c index 92c796d6a..5a2ba8a28 100644 --- a/os/Xtranssock.c +++ b/os/Xtranssock.c @@ -211,7 +211,6 @@ static Sockettrans2dev Sockettrans2devtab[] = { static int TRANS(SocketINETClose) (XtransConnInfo ciptr); #endif -#if (defined(TCPCONN) || defined(TRANS_REOPEN)) static int is_numeric (const char *str) { @@ -223,7 +222,6 @@ is_numeric (const char *str) return (1); } -#endif #ifdef UNIXCONN @@ -453,9 +451,6 @@ TRANS(SocketOpen) (int i, int type) return ciptr; } - -#ifdef TRANS_REOPEN - static XtransConnInfo TRANS(SocketReopen) (int i _X_UNUSED, int type, int fd, const char *port) @@ -536,9 +531,6 @@ TRANS(SocketReopen) (int i _X_UNUSED, int type, int fd, const char *port) return ciptr; } -#endif /* TRANS_REOPEN */ - - /* * These functions are the interface supplied in the Xtransport structure */ @@ -659,8 +651,6 @@ TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, const char *protocol, return ciptr; } -#ifdef TRANS_REOPEN - static XtransConnInfo TRANS(SocketReopenCOTSServer) (Xtransport *thistrans, int fd, const char *port) @@ -695,9 +685,6 @@ TRANS(SocketReopenCOTSServer) (Xtransport *thistrans, int fd, const char *port) return ciptr; } -#endif /* TRANS_REOPEN */ - - static int TRANS(SocketSetOption) (XtransConnInfo ciptr, int option, int arg) @@ -2353,9 +2340,7 @@ static Xtransport TRANS(SocketTCPFuncs) = { #endif /* TRANS_CLIENT */ tcp_nolisten, TRANS(SocketOpenCOTSServer), -#ifdef TRANS_REOPEN TRANS(SocketReopenCOTSServer), -#endif TRANS(SocketSetOption), TRANS(SocketINETCreateListener), NULL, /* ResetListener */ @@ -2386,9 +2371,7 @@ static Xtransport TRANS(SocketINETFuncs) = { #endif /* TRANS_CLIENT */ NULL, TRANS(SocketOpenCOTSServer), -#ifdef TRANS_REOPEN TRANS(SocketReopenCOTSServer), -#endif TRANS(SocketSetOption), TRANS(SocketINETCreateListener), NULL, /* ResetListener */ @@ -2420,9 +2403,7 @@ static Xtransport TRANS(SocketINET6Funcs) = { #endif /* TRANS_CLIENT */ NULL, TRANS(SocketOpenCOTSServer), -#ifdef TRANS_REOPEN TRANS(SocketReopenCOTSServer), -#endif TRANS(SocketSetOption), TRANS(SocketINETCreateListener), NULL, /* ResetListener */ @@ -2461,9 +2442,7 @@ static Xtransport TRANS(SocketLocalFuncs) = { #endif /* TRANS_CLIENT */ NULL, TRANS(SocketOpenCOTSServer), -#ifdef TRANS_REOPEN TRANS(SocketReopenCOTSServer), -#endif TRANS(SocketSetOption), TRANS(SocketUNIXCreateListener), TRANS(SocketUNIXResetListener), @@ -2506,9 +2485,7 @@ static Xtransport TRANS(SocketUNIXFuncs) = { NULL, #endif TRANS(SocketOpenCOTSServer), -#ifdef TRANS_REOPEN TRANS(SocketReopenCOTSServer), -#endif TRANS(SocketSetOption), TRANS(SocketUNIXCreateListener), TRANS(SocketUNIXResetListener), diff --git a/os/access.c b/os/access.c index c7b7a03c8..cc9580c60 100644 --- a/os/access.c +++ b/os/access.c @@ -85,7 +85,6 @@ SOFTWARE. #include #include #define XSERV_t -#define TRANS_REOPEN #include "os/Xtrans.h" #include #include diff --git a/os/connection.c b/os/connection.c index 153d727d0..04d23bca3 100644 --- a/os/connection.c +++ b/os/connection.c @@ -68,7 +68,6 @@ SOFTWARE. #include #include #define XSERV_t -#define TRANS_REOPEN #include "os/Xtrans.h" #include "os/Xtransint.h" #include diff --git a/os/io.c b/os/io.c index c90f78f3d..72faef24f 100644 --- a/os/io.c +++ b/os/io.c @@ -62,7 +62,6 @@ SOFTWARE. #endif #include #define XSERV_t -#define TRANS_REOPEN #include "os/Xtrans.h" #include #include diff --git a/os/utils.c b/os/utils.c index 4b0c88b28..86a0fb7bf 100644 --- a/os/utils.c +++ b/os/utils.c @@ -63,7 +63,6 @@ OR PERFORMANCE OF THIS SOFTWARE. #include "misc.h" #include #define XSERV_t -#define TRANS_REOPEN #include "os/Xtrans.h" #include diff --git a/os/xdmauth.c b/os/xdmauth.c index 42d7956d3..9b8aaa5b2 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -38,7 +38,6 @@ from The Open Group. #include #include #define XSERV_t -#define TRANS_REOPEN #include "os/auth.h" #include "os/Xtrans.h" diff --git a/os/xdmcp.c b/os/xdmcp.c index 66efa9470..4da75ae78 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -18,7 +18,6 @@ #ifdef WIN32 #include #define XSERV_t -#define TRANS_REOPEN #include "os/Xtrans.h" #endif @@ -48,7 +47,6 @@ #include "dixstruct.h" #define XSERV_t -#define TRANS_REOPEN #include "os/Xtrans.h" #ifdef XDMCP diff --git a/os/xstrans.c b/os/xstrans.c index aea79114b..0c8fc7f1a 100644 --- a/os/xstrans.c +++ b/os/xstrans.c @@ -2,6 +2,5 @@ #include -#define TRANS_REOPEN #define XSERV_t #include "os/transport.c"