From 2e4c338eda8ec6996b7bacc1d0c7dfe7de925864 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 1 Sep 2016 09:28:58 -0400 Subject: Revert "Make FreeConnInfo static" ajax: 75419e6b6d985ea8796f05d1acb5e154b065c9b9 of xtrans also seems to have broken xtest. And indeed it does, xts5 knows a fair amount about xlib internals for some reason. Whether that's cromulent or not, we want to be able to run automatic tests from top-of-tree, so we can't leave this broken. This reverts commit 75419e6b6d985ea8796f05d1acb5e154b065c9b9. Signed-off-by: Adam Jackson --- Xtrans.h | 4 ++++ Xtransint.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Xtrans.h b/Xtrans.h index 6760632..360b01b 100644 --- a/Xtrans.h +++ b/Xtrans.h @@ -215,6 +215,10 @@ typedef struct _XtransConnInfo *XtransConnInfo; * Function prototypes for the exposed interface */ +void TRANS(FreeConnInfo) ( + XtransConnInfo /* ciptr */ +); + #ifdef TRANS_CLIENT XtransConnInfo TRANS(OpenCOTSClient)( diff --git a/Xtransint.h b/Xtransint.h index 0a5b0e6..2156bd5 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -318,10 +318,6 @@ typedef struct _Xtransport_table { * systems, so they may be emulated. */ -static void TRANS(FreeConnInfo) ( - XtransConnInfo /* ciptr */ -); - #ifdef WIN32 #define READV(ciptr, iov, iovcnt) TRANS(ReadV)(ciptr, iov, iovcnt) -- cgit v1.2.3 From 560d7550e23e9b14056b4a9b2569c2f256015f8a Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Sat, 10 Sep 2016 22:09:51 -0700 Subject: 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 --- Xtranssock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Xtranssock.c b/Xtranssock.c index 866f4ab..56d52ea 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -517,7 +517,7 @@ TRANS(SocketReopen) (int i _X_UNUSED, int type, int fd, const char *port) addr->sa_len = addrlen; #endif addr->sa_family = AF_UNIX; -#ifdef HAS_STRLCPY +#if defined(HAVE_STRLCPY) || defined(HAS_STRLCPY) strlcpy(addr->sa_data, port, portlen); #else strncpy(addr->sa_data, port, portlen); -- cgit v1.2.3