diff options
| author | Jan Mazur <mzr@fb.com> | 2021-09-29 00:13:59 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-09-30 12:27:47 +0200 |
| commit | 0fe9018e1a1af0d906dfe934efe2f2b1ba48f060 (patch) | |
| tree | f16be1829f9de6e6aa02d144a5ebbab67c5530cb | |
| parent | 5de119d0b821286022ce1e928738cd9efb0f72fb (diff) | |
| download | curl-0fe9018e1a1af0d906dfe934efe2f2b1ba48f060.tar.gz | |
connnect: use sysaddr_un fron sys/un.h or custom-defined for windows
Closes #7737
| -rw-r--r-- | lib/connect.c | 4 | ||||
| -rw-r--r-- | lib/curl_setup.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/connect.c b/lib/connect.c index 48c98ebd4..94490805a 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 3840636f6..61384cdff 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 |