diff options
| author | Jonathan Gray <[email protected]> | 2018-02-28 21:21:14 +1100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-03-01 18:44:39 +0000 |
| commit | 034bbaa6c0ea0ff1cfc188c6fd49fa068b80be78 (patch) | |
| tree | 661b7cfee0d7f45f80fe8b03a1db5974be29428f | |
| parent | 7bea40e56652a1ded4374d92fb340b454fbac475 (diff) | |
gallium/util: use sockets on PIPE_OS_UNIX in u_network
Instead of listing all the UNIX PIPE_OS platforms just use
PIPE_OS_UNIX. Makes BSD sockets available on PIPE_OS_BSD.
Signed-off-by: Jonathan Gray <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/util/u_network.c | 9 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_network.h | 5 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/gallium/auxiliary/util/u_network.c b/src/gallium/auxiliary/util/u_network.c index 203205dc621..e74293bb105 100644 --- a/src/gallium/auxiliary/util/u_network.c +++ b/src/gallium/auxiliary/util/u_network.c @@ -9,8 +9,7 @@ # include <winsock2.h> # include <windows.h> # include <ws2tcpip.h> -#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \ - defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) +#elif defined(PIPE_OS_UNIX) # include <sys/socket.h> # include <netinet/in.h> # include <unistd.h> @@ -58,8 +57,7 @@ u_socket_close(int s) if (s < 0) return; -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) \ - || defined(PIPE_OS_APPLE) || defined(PIPE_OS_SOLARIS) +#if defined(PIPE_OS_UNIX) shutdown(s, SHUT_RDWR); close(s); #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER) @@ -181,8 +179,7 @@ u_socket_listen_on_port(uint16_t portnum) void u_socket_block(int s, boolean block) { -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) \ - || defined(PIPE_OS_APPLE) || defined(PIPE_OS_SOLARIS) +#if defined(PIPE_OS_UNIX) int old = fcntl(s, F_GETFL, 0); if (old == -1) return; diff --git a/src/gallium/auxiliary/util/u_network.h b/src/gallium/auxiliary/util/u_network.h index 61fe9a3c60f..2b7ce3f4bd2 100644 --- a/src/gallium/auxiliary/util/u_network.h +++ b/src/gallium/auxiliary/util/u_network.h @@ -4,10 +4,7 @@ #include "pipe/p_compiler.h" -#if defined(PIPE_SUBSYSTEM_WINDOWS_USER) -# define PIPE_HAVE_SOCKETS -#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \ - defined(PIPE_OS_APPLE) || defined(PIPE_OS_SOLARIS) +#if defined(PIPE_SUBSYSTEM_WINDOWS_USER) || defined(PIPE_OS_UNIX) # define PIPE_HAVE_SOCKETS #endif |