[Mesa-dev] [PATCH] gallium/util: use sockets on PIPE_OS_UNIX in u_network

[Brian Paul]

On 02/28/2018 03:21 AM, Jonathan Gray wrote:
> 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 <jsg at jsg.id.au>
> ---
>   src/gallium/auxiliary/util/u_network.c | 9 +++------
>   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 203205dc62..e74293bb10 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 61fe9a3c60..2b7ce3f4bd 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
>   
> 

Reviewed-by: Brian Paul <brianp at vmware.com>