From b5bfd3a49503387f1477a58b7c3d76fcdf06fbe5 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 12 Oct 2016 21:06:36 +0200 Subject: remove DECnet support just as Xorg upstream did --- nx-X11/lib/xtrans/Xtrans.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/lib/xtrans/Xtrans.h') diff --git a/nx-X11/lib/xtrans/Xtrans.h b/nx-X11/lib/xtrans/Xtrans.h index 04f4138dd..e68657ef5 100644 --- a/nx-X11/lib/xtrans/Xtrans.h +++ b/nx-X11/lib/xtrans/Xtrans.h @@ -481,7 +481,7 @@ TRANS(GetHostname) ( int /* maxlen */ ); -#if defined(WIN32) && (defined(TCPCONN) || defined(DNETCONN)) +#if defined(WIN32) && defined(TCPCONN) int TRANS(WSAStartup)(); #endif -- cgit v1.2.3 From 4ab02b27c2a8ba0e913e0a3319360c3feacb59e3 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 12 Oct 2016 22:27:34 +0200 Subject: undef Lynx --- nx-X11/lib/xtrans/Xtrans.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'nx-X11/lib/xtrans/Xtrans.h') diff --git a/nx-X11/lib/xtrans/Xtrans.h b/nx-X11/lib/xtrans/Xtrans.h index e68657ef5..25979673a 100644 --- a/nx-X11/lib/xtrans/Xtrans.h +++ b/nx-X11/lib/xtrans/Xtrans.h @@ -56,11 +56,7 @@ from The Open Group. #include #ifndef WIN32 -#ifndef Lynx #include -#else -#include -#endif #endif @@ -210,11 +206,7 @@ struct iovec { }; #else -#ifndef Lynx #include -#else -#include -#endif #endif typedef struct _XtransConnInfo *XtransConnInfo; -- cgit v1.2.3 From 64d51869fcc6ae4dd4c8d3e1d924fa2e4ccc75af Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 13 Oct 2016 00:16:30 +0200 Subject: whitespace cleanup empty lines and trailing whitespace --- nx-X11/lib/xtrans/Xtrans.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/lib/xtrans/Xtrans.h') diff --git a/nx-X11/lib/xtrans/Xtrans.h b/nx-X11/lib/xtrans/Xtrans.h index 25979673a..d746be7d0 100644 --- a/nx-X11/lib/xtrans/Xtrans.h +++ b/nx-X11/lib/xtrans/Xtrans.h @@ -467,7 +467,7 @@ TRANS(GetPeerNetworkId)( #endif /* ICE_t */ -int +int TRANS(GetHostname) ( char * /* buf */, int /* maxlen */ -- cgit v1.2.3 From c4b775f6dc6f8361dc27ace5d2b40ec42c3381bf Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 13 Oct 2016 00:35:04 +0200 Subject: align license headers with Xorg/xtrans upstream --- nx-X11/lib/xtrans/Xtrans.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'nx-X11/lib/xtrans/Xtrans.h') diff --git a/nx-X11/lib/xtrans/Xtrans.h b/nx-X11/lib/xtrans/Xtrans.h index d746be7d0..f6e91ad70 100644 --- a/nx-X11/lib/xtrans/Xtrans.h +++ b/nx-X11/lib/xtrans/Xtrans.h @@ -24,9 +24,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. -*/ - -/* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA + * Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * * All Rights Reserved * -- cgit v1.2.3 From 603fe25544e464561b0c9435f8816b5ab80814e1 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 18 May 2016 12:38:02 -0400 Subject: remove CLTS code Remove CLTS code Never been used, as far as I can tell. Reviewed-by: Keith Packard Signed-off-by: Adam Jackson Backported-to-NX-by: Ulrich Sibiller --- nx-X11/lib/xtrans/Xtrans.h | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'nx-X11/lib/xtrans/Xtrans.h') diff --git a/nx-X11/lib/xtrans/Xtrans.h b/nx-X11/lib/xtrans/Xtrans.h index f6e91ad70..2ab5ac3fe 100644 --- a/nx-X11/lib/xtrans/Xtrans.h +++ b/nx-X11/lib/xtrans/Xtrans.h @@ -277,22 +277,6 @@ XtransConnInfo TRANS(OpenCOTSServer)( #endif /* TRANS_SERVER */ -#ifdef TRANS_CLIENT - -XtransConnInfo TRANS(OpenCLTSClient)( - char * /* address */ -); - -#endif /* TRANS_CLIENT */ - -#ifdef TRANS_SERVER - -XtransConnInfo TRANS(OpenCLTSServer)( - char * /* address */ -); - -#endif /* TRANS_SERVER */ - #ifdef TRANS_REOPEN XtransConnInfo TRANS(ReopenCOTSServer)( @@ -301,12 +285,6 @@ XtransConnInfo TRANS(ReopenCOTSServer)( char * /* port */ ); -XtransConnInfo TRANS(ReopenCLTSServer)( - int, /* trans_id */ - int, /* fd */ - char * /* port */ -); - int TRANS(GetReopenInfo)( XtransConnInfo, /* ciptr */ int *, /* trans_id */ @@ -427,13 +405,6 @@ int TRANS(MakeAllCOTSServerListeners)( XtransConnInfo ** /* ciptrs_ret */ ); -int TRANS(MakeAllCLTSServerListeners)( - char *, /* port */ - int *, /* partial */ - int *, /* count_ret */ - XtransConnInfo ** /* ciptrs_ret */ -); - #endif /* TRANS_SERVER */ -- cgit v1.2.3 From e65b106a8989bf5d71de613f5f8b9dcbd559d382 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 31 Oct 2016 02:29:18 +0100 Subject: Xtrans: update to Xorg/xtrans upstream (1.3.5+) This lifts xtrans to the state of this commit: commit 560d7550e23e9b14056b4a9b2569c2f256015f8a Author: Jeremy Huddleston Sequoia Date: Sat Sep 10 22:09:51 2016 -0700 Update strlcpy macro check to also check HAVE_STRLCPY xorg-server moved from HAS_STRLCPY to HAVE_STRLCPY in 2011 cf-xserver: d829a7c5cb42c979b58f3547136df5b05d906423 Signed-off-by: Jeremy Huddleston Sequoia --- nx-X11/lib/xtrans/Xtrans.h | 117 ++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 70 deletions(-) (limited to 'nx-X11/lib/xtrans/Xtrans.h') diff --git a/nx-X11/lib/xtrans/Xtrans.h b/nx-X11/lib/xtrans/Xtrans.h index 2ab5ac3fe..54b2a1425 100644 --- a/nx-X11/lib/xtrans/Xtrans.h +++ b/nx-X11/lib/xtrans/Xtrans.h @@ -52,117 +52,75 @@ from The Open Group. #include #include +#include #ifndef WIN32 #include #endif +#ifdef __clang__ +/* Not all clients make use of all provided statics */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-function" +#endif /* * Set the functions names according to where this code is being compiled. */ #ifdef X11_t -#if !defined(UNIXCPP) || defined(ANSICPP) #define TRANS(func) _X11Trans##func -#else -#define TRANS(func) _X11Trans/**/func -#endif #ifdef XTRANSDEBUG -static char* __xtransname = "_X11Trans"; +static const char *__xtransname = "_X11Trans"; #endif #endif /* X11_t */ #ifdef XSERV_t -#if !defined(UNIXCPP) || defined(ANSICPP) #define TRANS(func) _XSERVTrans##func -#else -#define TRANS(func) _XSERVTrans/**/func -#endif #ifdef XTRANSDEBUG -static char* __xtransname = "_XSERVTrans"; +static const char *__xtransname = "_XSERVTrans"; #endif #define X11_t #endif /* XSERV_t */ #ifdef XIM_t -#if !defined(UNIXCPP) || defined(ANSICPP) #define TRANS(func) _XimXTrans##func -#else -#define TRANS(func) _XimXTrans/**/func -#endif #ifdef XTRANSDEBUG -static char* __xtransname = "_XimTrans"; +static const char *__xtransname = "_XimTrans"; #endif #endif /* XIM_t */ #ifdef FS_t -#if !defined(UNIXCPP) || defined(ANSICPP) #define TRANS(func) _FSTrans##func -#else -#define TRANS(func) _FSTrans/**/func -#endif #ifdef XTRANSDEBUG -static char* __xtransname = "_FSTrans"; +static const char *__xtransname = "_FSTrans"; #endif #endif /* FS_t */ #ifdef FONT_t -#if !defined(UNIXCPP) || defined(ANSICPP) #define TRANS(func) _FontTrans##func -#else -#define TRANS(func) _FontTrans/**/func -#endif #ifdef XTRANSDEBUG -static char* __xtransname = "_FontTrans"; +static const char *__xtransname = "_FontTrans"; #endif #endif /* FONT_t */ #ifdef ICE_t -#if !defined(UNIXCPP) || defined(ANSICPP) #define TRANS(func) _IceTrans##func -#else -#define TRANS(func) _IceTrans/**/func -#endif #ifdef XTRANSDEBUG -static char* __xtransname = "_IceTrans"; +static const char *__xtransname = "_IceTrans"; #endif #endif /* ICE_t */ -#ifdef TEST_t -#if !defined(UNIXCPP) || defined(ANSICPP) -#define TRANS(func) _TESTTrans##func -#else -#define TRANS(func) _TESTTrans/**/func -#endif -#ifdef XTRANSDEBUG -static char* __xtransname = "_TESTTrans"; -#endif -#endif /* TEST_t */ - -#ifdef LBXPROXY_t -#if !defined(UNIXCPP) || defined(ANSICPP) -#define TRANS(func) _LBXPROXYTrans##func -#else -#define TRANS(func) _LBXPROXYTrans/**/func -#endif -#define X11_t /* The server defines this - so should the LBX proxy */ -#ifdef XTRANSDEBUG -static char* __xtransname = "_LBXPROXYTrans"; -#endif -#endif /* LBXPROXY_t */ - #if !defined(TRANS) -#if !defined(UNIXCPP) || defined(ANSICPP) #define TRANS(func) _XTrans##func -#else -#define TRANS(func) _XTrans/**/func -#endif #ifdef XTRANSDEBUG -static char* __xtransname = "_XTrans"; +static const char *__xtransname = "_XTrans"; #endif #endif /* !TRANS */ +#ifdef __clang__ +#pragma clang diagnostic pop +#endif /* * Create a single address structure that can be used wherever @@ -190,7 +148,7 @@ typedef long BytesReadable_t; #endif -#if defined(WIN32) || (defined(USG) && !defined(umips) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__)) +#if defined(WIN32) || defined(USG) /* * TRANS(Readv) and TRANS(Writev) use struct iovec, normally found @@ -264,7 +222,7 @@ void TRANS(FreeConnInfo) ( #ifdef TRANS_CLIENT XtransConnInfo TRANS(OpenCOTSClient)( - char * /* address */ + const char * /* address */ ); #endif /* TRANS_CLIENT */ @@ -272,7 +230,7 @@ XtransConnInfo TRANS(OpenCOTSClient)( #ifdef TRANS_SERVER XtransConnInfo TRANS(OpenCOTSServer)( - char * /* address */ + const char * /* address */ ); #endif /* TRANS_SERVER */ @@ -282,7 +240,7 @@ XtransConnInfo TRANS(OpenCOTSServer)( XtransConnInfo TRANS(ReopenCOTSServer)( int, /* trans_id */ int, /* fd */ - char * /* port */ + const char * /* port */ ); int TRANS(GetReopenInfo)( @@ -305,12 +263,24 @@ int TRANS(SetOption)( int TRANS(CreateListener)( XtransConnInfo, /* ciptr */ - char *, /* port */ + const char *, /* port */ unsigned int /* flags */ ); +int TRANS(Received) ( + const char* /* protocol*/ +); + int TRANS(NoListen) ( - char* /* protocol*/ + const char* /* protocol*/ +); + +int TRANS(Listen) ( + const char* /* protocol*/ +); + +int TRANS(IsListening) ( + const char* /* protocol*/ ); int TRANS(ResetListener)( @@ -328,7 +298,7 @@ XtransConnInfo TRANS(Accept)( int TRANS(Connect)( XtransConnInfo, /* ciptr */ - char * /* address */ + const char * /* address */ ); #endif /* TRANS_CLIENT */ @@ -362,6 +332,10 @@ int TRANS(Writev)( int /* size */ ); +int TRANS(SendFd) (XtransConnInfo ciptr, int fd, int do_close); + +int TRANS(RecvFd) (XtransConnInfo ciptr); + int TRANS(Disconnect)( XtransConnInfo /* ciptr */ ); @@ -378,12 +352,15 @@ int TRANS(IsLocal)( XtransConnInfo /* ciptr */ ); +#ifdef NX_TRANS_SOCKET +/* needed for pre-xcb libX11 as we have in NX */ int TRANS(GetMyAddr)( - XtransConnInfo, /* ciptr */ - int *, /* familyp */ - int *, /* addrlenp */ - Xtransaddr ** /* addrp */ + XtransConnInfo, /* ciptr */ + int *, /* familyp */ + int *, /* addrlenp */ + Xtransaddr ** /* addrp */ ); +#endif int TRANS(GetPeerAddr)( XtransConnInfo, /* ciptr */ @@ -399,7 +376,7 @@ int TRANS(GetConnectionNumber)( #ifdef TRANS_SERVER int TRANS(MakeAllCOTSServerListeners)( - char *, /* port */ + const char *, /* port */ int *, /* partial */ int *, /* count_ret */ XtransConnInfo ** /* ciptrs_ret */ -- cgit v1.2.3