From: Jan Mazur <mzr@fb.com>
Date: Tue, 28 Sep 2021 23:13:59 +0000 (+0100)
Subject: connnect: use sysaddr_un fron sys/un.h or custom-defined for windows
X-Git-Tag: curl-7_80_0~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fe9018e1a1af0d906dfe934efe2f2b1ba48f060;p=thirdparty%2Fcurl.git

connnect: use sysaddr_un fron sys/un.h or custom-defined for windows

Closes #7737
---

diff --git a/lib/connect.c b/lib/connect.c
index 48c98ebd45..94490805ad 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -629,7 +629,7 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
 #ifdef ENABLE_IPV6
   struct sockaddr_in6 *si6 = NULL;
 #endif
-#if defined(HAVE_SYS_UN_H) && defined(AF_UNIX)
+#if (defined(HAVE_SYS_UN_H) || defined(WIN32_SOCKADDR_UN)) && defined(AF_UNIX)
   struct sockaddr_un *su = NULL;
 #else
   (void)salen;
@@ -656,7 +656,7 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
       }
       break;
 #endif
-#if defined(HAVE_SYS_UN_H) && defined(AF_UNIX)
+#if (defined(HAVE_SYS_UN_H) || defined(WIN32_SOCKADDR_UN)) && defined(AF_UNIX)
     case AF_UNIX:
       if(salen > (curl_socklen_t)sizeof(CURL_SA_FAMILY_T)) {
         su = (struct sockaddr_un*)sa;
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 3840636f64..61384cdff6 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -838,6 +838,7 @@ int getpwuid_r(uid_t uid, struct passwd *pwd, char *buf,
        ADDRESS_FAMILY sun_family;
        char sun_path[UNIX_PATH_MAX];
      } SOCKADDR_UN, *PSOCKADDR_UN;
+#    define WIN32_SOCKADDR_UN
 #  endif
 #endif