NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gallium/util: use sockets on PIPE_OS_UNIX in u_network

Browse source 
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@jsg.id.au>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Jonathan Gray 2018-02-28 21:21:14 +11:00 • committed by Emil Velikov
parent 7bea40e566
commit 034bbaa6c0
2 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/auxiliary/util/u_network.c
View file

@ -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;

5
src/gallium/auxiliary/util/u_network.h
View file

@ -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