diff options
author | Brian Paul <brianp@vmware.com> | 2009-09-09 09:00:58 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-09-09 09:00:58 -0600 |
commit | 7bf63473623e01933adc0e8f4464eda8f2860564 (patch) | |
tree | 4cfb1b611c999c4b158e6809ee78a02e4d7698b5 /src/gallium/auxiliary/util/u_network.c | |
parent | 94a8157ef6bf6695cdc66325c9a7698e64f3e37e (diff) | |
parent | 0c309bb494b6ee1c403442d1207743f749f95b6e (diff) |
Merge branch 'mesa_7_6_branch'
Diffstat (limited to 'src/gallium/auxiliary/util/u_network.c')
-rw-r--r-- | src/gallium/auxiliary/util/u_network.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_network.c b/src/gallium/auxiliary/util/u_network.c index 07d804ecdb..bc4b758406 100644 --- a/src/gallium/auxiliary/util/u_network.c +++ b/src/gallium/auxiliary/util/u_network.c @@ -6,7 +6,7 @@ #if defined(PIPE_SUBSYSTEM_WINDOWS_USER) # include <winsock2.h> # include <windows.h> -#elif defined(PIPE_OS_LINUX) +#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) # include <sys/socket.h> # include <netinet/in.h> # include <unistd.h> @@ -54,7 +54,7 @@ u_socket_close(int s) if (s < 0) return; -#if defined(PIPE_OS_LINUX) +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) shutdown(s, SHUT_RDWR); close(s); #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER) @@ -169,7 +169,7 @@ u_socket_listen_on_port(uint16_t portnum) void u_socket_block(int s, boolean block) { -#if defined(PIPE_OS_LINUX) +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) int old = fcntl(s, F_GETFL, 0); if (old == -1) return; |