diff options
| author | Brent Cook <busterb@gmail.com> | 2022-04-19 15:03:51 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2022-04-19 15:03:51 -0500 |
| commit | 5c7021517a6d7675276d3715f44ebef9f09ca0a7 (patch) | |
| tree | 594304c627b9061369e862a7d2ef60be799cef73 | |
| parent | 4458b705f4acf9265a346403f3da3cbd8afaa21a (diff) | |
| parent | fe903fb7c59600f7679b2afb0d33f4a0c3f93ae2 (diff) | |
| download | portable-5c7021517a6d7675276d3715f44ebef9f09ca0a7.tar.gz portable-5c7021517a6d7675276d3715f44ebef9f09ca0a7.tar.bz2 portable-5c7021517a6d7675276d3715f44ebef9f09ca0a7.zip | |
Land #745, fix nc build on macOS
| -rw-r--r-- | apps/nc/compat/sys/socket.h | 3 | ||||
| -rw-r--r-- | include/compat/sys/socket.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/nc/compat/sys/socket.h b/apps/nc/compat/sys/socket.h index 13eb380..2c7ee4f 100644 --- a/apps/nc/compat/sys/socket.h +++ b/apps/nc/compat/sys/socket.h | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | #ifndef _WIN32 | 6 | #ifndef _WIN32 |
| 7 | #include_next <sys/socket.h> | 7 | #include_next <sys/socket.h> |
| 8 | 8 | ||
| 9 | #if !defined(SOCK_NONBLOCK) || !defined(SOCK_CLOEXEC) | 9 | #if defined(NEED_SOCKET_FLAGS) |
| 10 | #define NEED_SOCKET_FLAGS | ||
| 11 | int _socket(int domain, int type, int protocol); | 10 | int _socket(int domain, int type, int protocol); |
| 12 | #ifndef SOCKET_FLAGS_PRIV | 11 | #ifndef SOCKET_FLAGS_PRIV |
| 13 | #define socket(d, t, p) _socket(d, t, p) | 12 | #define socket(d, t, p) _socket(d, t, p) |
diff --git a/include/compat/sys/socket.h b/include/compat/sys/socket.h index 10eb05f..2f0b197 100644 --- a/include/compat/sys/socket.h +++ b/include/compat/sys/socket.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #endif | 10 | #endif |
| 11 | 11 | ||
| 12 | #if !defined(SOCK_NONBLOCK) || !defined(SOCK_CLOEXEC) | 12 | #if !defined(SOCK_NONBLOCK) || !defined(SOCK_CLOEXEC) |
| 13 | #define NEED_SOCKET_FLAGS | ||
| 13 | #define SOCK_CLOEXEC 0x8000 /* set FD_CLOEXEC */ | 14 | #define SOCK_CLOEXEC 0x8000 /* set FD_CLOEXEC */ |
| 14 | #define SOCK_NONBLOCK 0x4000 /* set O_NONBLOCK */ | 15 | #define SOCK_NONBLOCK 0x4000 /* set O_NONBLOCK */ |
| 15 | int bsd_socketpair(int domain, int type, int protocol, int socket_vector[2]); | 16 | int bsd_socketpair(int domain, int type, int protocol, int socket_vector[2]); |