From 5d06f46e56e87b20fad36506bd06007ae2c9b38d Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 2 Nov 2016 23:14:52 +0100 Subject: xtrans: fix compilation warnings because of missing XTRANS_SEND_FDS --- nx-X11/lib/X11/Imakefile | 2 +- nx-X11/lib/xtrans/Xtranssock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index e52e429c4..2f9535716 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -156,7 +156,7 @@ EXTRA_LIBRARIES = /**/ POLL_DEFINES = -DUSE_POLL #endif CONN_DEFINES = $(CONNECTION_FLAGS) - XTRANS_X_DEFINES = -DX11_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) + XTRANS_X_DEFINES = -DX11_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) -DXTRANS_SEND_FDS=0 XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) #if HasBSD44Sockets SOCK_DEFINES = -DBSD44SOCKETS diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c index 62bfca734..12a2e1c3e 100644 --- a/nx-X11/lib/xtrans/Xtranssock.c +++ b/nx-X11/lib/xtrans/Xtranssock.c @@ -283,7 +283,7 @@ static int TRANS(SocketINETClose) (XtransConnInfo ciptr); #ifdef NX_TRANS_SOCKET -#ifdef XTRANS_SEND_FDS +#if XTRANS_SEND_FDS #error XTRANS_SEND_FDS is unsupported for NX! #endif -- cgit v1.2.3 From 2631603b60ae8142e2a61a5d3a3b8b7be6d9a737 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 2 Nov 2016 23:36:50 +0100 Subject: xtrans: Fix compile warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit warning: format ‘%p’ expects argument of type ‘void *’ --- nx-X11/lib/xtrans/Xtrans.c | 4 ++-- nx-X11/lib/xtrans/Xtranssock.c | 34 +++++++++++++++++----------------- nx-X11/lib/xtrans/Xtransutil.c | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/nx-X11/lib/xtrans/Xtrans.c b/nx-X11/lib/xtrans/Xtrans.c index 16dd61155..637c419a2 100644 --- a/nx-X11/lib/xtrans/Xtrans.c +++ b/nx-X11/lib/xtrans/Xtrans.c @@ -132,7 +132,7 @@ void TRANS(FreeConnInfo) (XtransConnInfo ciptr) { - prmsg (3,"FreeConnInfo(%p)\n", ciptr); + prmsg (3,"FreeConnInfo(%p)\n", (void *) ciptr); if (ciptr->addr) free (ciptr->addr); @@ -1143,7 +1143,7 @@ TRANS(MakeAllCOTSServerListeners) (const char *port, int *partial, int ipv6_succ = 0; #endif prmsg (2,"MakeAllCOTSServerListeners(%s,%p)\n", - port ? port : "NULL", ciptrs_ret); + port ? port : "NULL", (void *) ciptrs_ret); *count_ret = 0; diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c index 12a2e1c3e..b69039d12 100644 --- a/nx-X11/lib/xtrans/Xtranssock.c +++ b/nx-X11/lib/xtrans/Xtranssock.c @@ -325,7 +325,7 @@ void TRANS(SocketRejectConnection) (XtransConnInfo ciptr) struct timeval t; int f; - prmsg (3, "SocketRejectConnection(%p)\n", ciptr); + prmsg (3, "SocketRejectConnection(%p)\n", (void *) ciptr); FD_ZERO(&fs); FD_SET(ciptr -> fd, &fs); @@ -619,7 +619,7 @@ int TRANS(SocketCongestionChange) (XtransConnInfo ciptr, int *state) _NXProxyConnInfo *proxy_conn; - prmsg (3, "SocketCongestionChange(%p)\n", ciptr); + prmsg (3, "SocketCongestionChange(%p)\n", (void *) ciptr); proxy_conn = (_NXProxyConnInfo *) ciptr->priv; @@ -700,7 +700,7 @@ TRANS(SocketINETGetAddr) (XtransConnInfo ciptr) void *socknamePtr; SOCKLEN_T namelen; - prmsg (3,"SocketINETGetAddr(%p)\n", ciptr); + prmsg (3,"SocketINETGetAddr(%p)\n", (void *) ciptr); #if defined(IPv6) && defined(AF_INET6) namelen = sizeof(socknamev6); @@ -777,7 +777,7 @@ TRANS(SocketINETGetPeerAddr) (XtransConnInfo ciptr) bzero(socknamePtr, namelen); - prmsg (3,"SocketINETGetPeerAddr(%p)\n", ciptr); + prmsg (3,"SocketINETGetPeerAddr(%p)\n", (void *) ciptr); if (getpeername (ciptr->fd, (struct sockaddr *) socknamePtr, (void *)&namelen) < 0) @@ -1208,7 +1208,7 @@ TRANS(SocketCreateListener) (XtransConnInfo ciptr, int fd = ciptr->fd; int retry; - prmsg (3, "SocketCreateListener(%p,%d)\n", ciptr, fd); + prmsg (3, "SocketCreateListener(%p,%d)\n", (void *) ciptr, fd); if (Sockettrans2devtab[ciptr->index].family == AF_INET #if defined(IPv6) && defined(AF_INET6) @@ -1549,7 +1549,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr) abstract = ciptr->transptr->flags & TRANS_ABSTRACT; #endif - prmsg (3, "SocketUNIXResetListener(%p,%d)\n", ciptr, ciptr->fd); + prmsg (3, "SocketUNIXResetListener(%p,%d)\n", (void *) ciptr, ciptr->fd); if (!abstract && ( stat (unsock->sun_path, &statb) == -1 || @@ -1629,7 +1629,7 @@ TRANS(SocketINETAccept) (XtransConnInfo ciptr, int *status) struct sockaddr_in sockname; SOCKLEN_T namelen = sizeof(sockname); - prmsg (2, "SocketINETAccept(%p,%d)\n", ciptr, ciptr->fd); + prmsg (2, "SocketINETAccept(%p,%d)\n", (void *) ciptr, ciptr->fd); if ((newciptr = calloc (1, sizeof(struct _XtransConnInfo))) == NULL) { @@ -1705,7 +1705,7 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) struct sockaddr_un sockname; SOCKLEN_T namelen = sizeof sockname; - prmsg (2, "SocketUNIXAccept(%p,%d)\n", ciptr, ciptr->fd); + prmsg (2, "SocketUNIXAccept(%p,%d)\n", (void *) ciptr, ciptr->fd); if ((newciptr = calloc (1, sizeof(struct _XtransConnInfo))) == NULL) { @@ -2491,7 +2491,7 @@ TRANS(SocketBytesReadable) (XtransConnInfo ciptr, BytesReadable_t *pend) { prmsg (2,"SocketBytesReadable(%p,%d,%p)\n", - ciptr, ciptr->fd, pend); + (void *) ciptr, ciptr->fd, (void *) pend); #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) @@ -2666,7 +2666,7 @@ static int TRANS(SocketRead) (XtransConnInfo ciptr, char *buf, int size) { - prmsg (2,"SocketRead(%d,%p,%d)\n", ciptr->fd, buf, size); + prmsg (2,"SocketRead(%d,%p,%d)\n", ciptr->fd, (void *) buf, size); #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) @@ -2791,7 +2791,7 @@ static int TRANS(SocketReadv) (XtransConnInfo ciptr, struct iovec *buf, int size) { - prmsg (2,"SocketReadv(%d,%p,%d)\n", ciptr->fd, buf, size); + prmsg (2,"SocketReadv(%d,%p,%d)\n", ciptr->fd, (void *) buf, size); #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) @@ -2883,7 +2883,7 @@ static int TRANS(SocketWritev) (XtransConnInfo ciptr, struct iovec *buf, int size) { - prmsg (2,"SocketWritev(%d,%p,%d)\n", ciptr->fd, buf, size); + prmsg (2,"SocketWritev(%d,%p,%d)\n", ciptr->fd, (void *) buf, size); #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) @@ -2985,7 +2985,7 @@ static int TRANS(SocketWrite) (XtransConnInfo ciptr, char *buf, int size) { - prmsg (2,"SocketWrite(%d,%p,%d)\n", ciptr->fd, buf, size); + prmsg (2,"SocketWrite(%d,%p,%d)\n", ciptr->fd, (void *) buf, size); #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) @@ -3062,7 +3062,7 @@ static int TRANS(SocketDisconnect) (XtransConnInfo ciptr) { - prmsg (2,"SocketDisconnect(%p,%d)\n", ciptr, ciptr->fd); + prmsg (2,"SocketDisconnect(%p,%d)\n", (void *) ciptr, ciptr->fd); #ifdef WIN32 { @@ -3081,7 +3081,7 @@ static int TRANS(SocketINETClose) (XtransConnInfo ciptr) { - prmsg (2,"SocketINETClose(%p,%d)\n", ciptr, ciptr->fd); + prmsg (2,"SocketINETClose(%p,%d)\n", (void *) ciptr, ciptr->fd); #ifdef WIN32 { @@ -3109,7 +3109,7 @@ TRANS(SocketUNIXClose) (XtransConnInfo ciptr) struct sockaddr_un *sockname = (struct sockaddr_un *) ciptr->addr; int ret; - prmsg (2,"SocketUNIXClose(%p,%d)\n", ciptr, ciptr->fd); + prmsg (2,"SocketUNIXClose(%p,%d)\n", (void *) ciptr, ciptr->fd); #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) @@ -3165,7 +3165,7 @@ TRANS(SocketUNIXCloseForCloning) (XtransConnInfo ciptr) int ret; prmsg (2,"SocketUNIXCloseForCloning(%p,%d)\n", - ciptr, ciptr->fd); + (void *) ciptr, ciptr->fd); #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) diff --git a/nx-X11/lib/xtrans/Xtransutil.c b/nx-X11/lib/xtrans/Xtransutil.c index 63f0fc355..4b5bcf2a7 100644 --- a/nx-X11/lib/xtrans/Xtransutil.c +++ b/nx-X11/lib/xtrans/Xtransutil.c @@ -91,7 +91,7 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp) { - prmsg(2,"ConvertAddress(%d,%d,%p)\n",*familyp,*addrlenp,*addrp); + prmsg(2,"ConvertAddress(%d,%d,%p)\n",*familyp,*addrlenp,(void *) *addrp); switch( *familyp ) { -- cgit v1.2.3 From 90612d25ca9a42a4f9bdea9dbd867abb635ba98f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 2 Nov 2016 23:37:30 +0100 Subject: libX11 + Xserver: fix missing define warning warning: "XTRANS_SEND_FDS" is not defined [-Wundef] This define came in via the recent xtrans update. --- nx-X11/lib/X11/Imakefile | 2 +- nx-X11/programs/Xserver/os/Imakefile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 2f9535716..15097e716 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -157,7 +157,7 @@ EXTRA_LIBRARIES = /**/ #endif CONN_DEFINES = $(CONNECTION_FLAGS) XTRANS_X_DEFINES = -DX11_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) -DXTRANS_SEND_FDS=0 - XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) + XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) -DXTRANS_SEND_FDS=0 #if HasBSD44Sockets SOCK_DEFINES = -DBSD44SOCKETS #endif diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile index e78b422ab..d381ac272 100644 --- a/nx-X11/programs/Xserver/os/Imakefile +++ b/nx-X11/programs/Xserver/os/Imakefile @@ -135,10 +135,13 @@ BOOTSTRAPCFLAGS = #if HasPam && HasPamMisc PAM_DEFINES = -DUSE_PAM #endif + XTRANS_DEFINES = -DXTRANS_SEND_FDS=0 + DEFINES = $(CONNECTION_FLAGS) $(MEM_DEFINES) \ $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) \ $(RGB_DEFINES) $(GETPEER_DEFINES) \ - $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES) $(NX_DEFINES) + $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES) \ + $(XTRANS_DEFINES) $(NX_DEFINES) INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \ -I$(TOP)/lib/Xau $(NX_INCLUDES) \ -- cgit v1.2.3 From 882c034c3713855bb15dde84b1bd16dc887171cb Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 2 Nov 2016 23:55:23 +0100 Subject: xtrans: silence compiler warning regarding is_numeric MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit is_numeric is only needed if X11_t is defined. Silences "warning: ‘is_numeric’ defined but not used [-Wunused-function]" --- nx-X11/lib/xtrans/Xtransint.h | 3 ++- nx-X11/lib/xtrans/Xtransutil.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nx-X11/lib/xtrans/Xtransint.h b/nx-X11/lib/xtrans/Xtransint.h index 2156bd52f..f7e07687b 100644 --- a/nx-X11/lib/xtrans/Xtransint.h +++ b/nx-X11/lib/xtrans/Xtransint.h @@ -351,10 +351,11 @@ static int TRANS(WriteV)( #endif /* WIN32 */ - +#if defined(X11_t) static int is_numeric ( const char * /* str */ ); +#endif #ifdef TRANS_SERVER static int trans_mkdir ( diff --git a/nx-X11/lib/xtrans/Xtransutil.c b/nx-X11/lib/xtrans/Xtransutil.c index 4b5bcf2a7..0063e83d8 100644 --- a/nx-X11/lib/xtrans/Xtransutil.c +++ b/nx-X11/lib/xtrans/Xtransutil.c @@ -434,6 +434,7 @@ TRANS(WSAStartup) (void) #include +#if defined(X11_t) static int is_numeric (const char *str) { @@ -445,6 +446,7 @@ is_numeric (const char *str) return (1); } +#endif #ifdef TRANS_SERVER #include -- cgit v1.2.3 From 47fab08aa68367734dc4cdf66dfb29ed086947e7 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 2 Nov 2016 23:57:43 +0100 Subject: xtrans: fix const warnings for SocketConnectConnInfo --- nx-X11/lib/xtrans/Xtranssock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c index b69039d12..1a76c406d 100644 --- a/nx-X11/lib/xtrans/Xtranssock.c +++ b/nx-X11/lib/xtrans/Xtranssock.c @@ -458,7 +458,7 @@ static XtransConnInfo TRANS(SocketCreateConnInfo) () return ciptr; } -static int TRANS(SocketConnectConnInfo) (XtransConnInfo ciptr, char *host, char *port) +static int TRANS(SocketConnectConnInfo) (XtransConnInfo ciptr, const char *host, const char *port) { int fds[2]; char display[1024]; -- cgit v1.2.3