Merge remote-tracking branch 'origin/master' into obsd

3 files changed, 5 insertions, 5 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)
diff --git a/Xtranssock.c b/Xtranssock.c
index 6aabadd..05b13df 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);