diff options
author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-01-04 17:03:13 +0100 |
---|---|---|
committer | Maarten Bosmans <mkbosmans@gmail.com> | 2011-02-17 11:58:21 +0100 |
commit | 4f1d4044f8409ff29eeb7f97324daba496e40714 (patch) | |
tree | 2a839bd94d128175e99a91e3a15b7cb6a18de298 /src/pulsecore | |
parent | d6d9fb295d03a411974a148e469465e0f7c59891 (diff) |
Use <pulsecore/socket.h> instead of <sys/socket.h>
The check whether POSIX socket.h or WIN32 winsock2.h must be included can be
made centrally. The downside is that some functionality of e.g. arpa/inet.h is
also implemented in winsock.h, so that some files that don't use socket
functions, but do use inet.h functions, must also include pulsecore/socket.h.
(as well as arpa/inet.h)
Diffstat (limited to 'src/pulsecore')
-rw-r--r-- | src/pulsecore/core-util.c | 3 | ||||
-rw-r--r-- | src/pulsecore/core-util.h | 2 | ||||
-rw-r--r-- | src/pulsecore/creds.h | 4 | ||||
-rw-r--r-- | src/pulsecore/inet_ntop.c | 6 | ||||
-rw-r--r-- | src/pulsecore/inet_ntop.h | 6 | ||||
-rw-r--r-- | src/pulsecore/inet_pton.c | 6 | ||||
-rw-r--r-- | src/pulsecore/inet_pton.h | 6 | ||||
-rw-r--r-- | src/pulsecore/iochannel.c | 7 | ||||
-rw-r--r-- | src/pulsecore/ioline.c | 2 | ||||
-rw-r--r-- | src/pulsecore/ipacl.c | 7 | ||||
-rw-r--r-- | src/pulsecore/parseaddr.c | 4 | ||||
-rw-r--r-- | src/pulsecore/pipe.c | 6 | ||||
-rw-r--r-- | src/pulsecore/poll.c | 11 | ||||
-rw-r--r-- | src/pulsecore/pstream.c | 6 | ||||
-rw-r--r-- | src/pulsecore/rtpoll.c | 1 | ||||
-rw-r--r-- | src/pulsecore/socket-client.c | 7 | ||||
-rw-r--r-- | src/pulsecore/socket-server.c | 11 | ||||
-rw-r--r-- | src/pulsecore/socket-util.c | 8 | ||||
-rw-r--r-- | src/pulsecore/socket-util.h | 2 | ||||
-rw-r--r-- | src/pulsecore/socket.h (renamed from src/pulsecore/winsock.h) | 9 | ||||
-rw-r--r-- | src/pulsecore/tagstruct.c | 2 |
21 files changed, 38 insertions, 78 deletions
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index ec0b338d..3ce5edbf 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -43,7 +43,6 @@ #include <regex.h> #include <langinfo.h> #include <sys/utsname.h> -#include <sys/socket.h> #ifdef HAVE_STRTOF_L #include <locale.h> @@ -110,7 +109,7 @@ #include <pulse/utf8.h> #include <pulsecore/core-error.h> -#include <pulsecore/winsock.h> +#include <pulsecore/socket.h> #include <pulsecore/log.h> #include <pulsecore/macro.h> #include <pulsecore/thread.h> diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h index 0d63cfcb..8619330d 100644 --- a/src/pulsecore/core-util.h +++ b/src/pulsecore/core-util.h @@ -28,7 +28,6 @@ #include <stdarg.h> #include <stdio.h> #include <string.h> -#include <sys/socket.h> #ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> @@ -36,6 +35,7 @@ #include <pulse/gccmacro.h> #include <pulsecore/macro.h> +#include <pulsecore/socket.h> #ifndef PACKAGE #error "Please include config.h before including this file!" diff --git a/src/pulsecore/creds.h b/src/pulsecore/creds.h index c15c469b..9e6fb124 100644 --- a/src/pulsecore/creds.h +++ b/src/pulsecore/creds.h @@ -28,9 +28,7 @@ #error "Please include config.h before including this file!" #endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif +#include <pulsecore/socket.h> #ifdef HAVE_SYS_UN_H #include <sys/un.h> diff --git a/src/pulsecore/inet_ntop.c b/src/pulsecore/inet_ntop.c index 012a1a05..e283a670 100644 --- a/src/pulsecore/inet_ntop.c +++ b/src/pulsecore/inet_ntop.c @@ -28,11 +28,7 @@ #ifndef HAVE_INET_NTOP -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif - -#include "winsock.h" +#include <pulsecore/socket.h> #include "inet_ntop.h" diff --git a/src/pulsecore/inet_ntop.h b/src/pulsecore/inet_ntop.h index 7fb67b44..7e1b2037 100644 --- a/src/pulsecore/inet_ntop.h +++ b/src/pulsecore/inet_ntop.h @@ -1,11 +1,7 @@ #ifndef fooinet_ntophfoo #define fooinet_ntophfoo -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif - -#include "winsock.h" +#include <pulsecore/socket.h> const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); diff --git a/src/pulsecore/inet_pton.c b/src/pulsecore/inet_pton.c index abdfa467..198d1a0d 100644 --- a/src/pulsecore/inet_pton.c +++ b/src/pulsecore/inet_pton.c @@ -28,11 +28,7 @@ #ifndef HAVE_INET_PTON -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif - -#include "winsock.h" +#include <pulsecore/socket.h> #include "inet_pton.h" diff --git a/src/pulsecore/inet_pton.h b/src/pulsecore/inet_pton.h index 111b4a07..9d9c476a 100644 --- a/src/pulsecore/inet_pton.h +++ b/src/pulsecore/inet_pton.h @@ -1,11 +1,7 @@ #ifndef fooinet_ptonhfoo #define fooinet_ptonhfoo -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif - -#include "winsock.h" +#include <pulsecore/socket.h> int inet_pton(int af, const char *src, void *dst); diff --git a/src/pulsecore/iochannel.c b/src/pulsecore/iochannel.c index f85c9896..f89b0670 100644 --- a/src/pulsecore/iochannel.c +++ b/src/pulsecore/iochannel.c @@ -28,19 +28,16 @@ #include <fcntl.h> #include <unistd.h> #include <errno.h> -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif + #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif -#include "winsock.h" - #include <pulse/xmalloc.h> #include <pulsecore/core-error.h> #include <pulsecore/core-util.h> +#include <pulsecore/socket.h> #include <pulsecore/socket-util.h> #include <pulsecore/log.h> #include <pulsecore/macro.h> diff --git a/src/pulsecore/ioline.c b/src/pulsecore/ioline.c index 7afdb08c..963f7d22 100644 --- a/src/pulsecore/ioline.c +++ b/src/pulsecore/ioline.c @@ -30,7 +30,7 @@ #include <pulse/xmalloc.h> -#include <pulsecore/winsock.h> +#include <pulsecore/socket.h> #include <pulsecore/core-error.h> #include <pulsecore/log.h> #include <pulsecore/macro.h> diff --git a/src/pulsecore/ipacl.c b/src/pulsecore/ipacl.c index 312e0403..0cbe34af 100644 --- a/src/pulsecore/ipacl.c +++ b/src/pulsecore/ipacl.c @@ -28,9 +28,6 @@ #include <sys/types.h> #include <string.h> -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif @@ -50,10 +47,10 @@ #include <pulsecore/llist.h> #include <pulsecore/log.h> #include <pulsecore/macro.h> -#include <pulsecore/winsock.h> +#include <pulsecore/socket.h> #ifndef HAVE_INET_PTON -#include "inet_pton.h" +#include <pulsecore/inet_pton.h> #endif #include "ipacl.h" diff --git a/src/pulsecore/parseaddr.c b/src/pulsecore/parseaddr.c index 44cd9a05..7f6cd903 100644 --- a/src/pulsecore/parseaddr.c +++ b/src/pulsecore/parseaddr.c @@ -25,8 +25,10 @@ #include <string.h> #include <stdlib.h> + +#ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> -#include <sys/socket.h> +#endif #include <pulse/xmalloc.h> #include <pulse/util.h> diff --git a/src/pulsecore/pipe.c b/src/pulsecore/pipe.c index c21e4b1f..db8e16f8 100644 --- a/src/pulsecore/pipe.c +++ b/src/pulsecore/pipe.c @@ -29,11 +29,7 @@ #include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif - -#include "winsock.h" +#include <pulsecore/socket.h> #include "pipe.h" diff --git a/src/pulsecore/poll.c b/src/pulsecore/poll.c index b98fb169..b993c478 100644 --- a/src/pulsecore/poll.c +++ b/src/pulsecore/poll.c @@ -45,8 +45,7 @@ #include <sys/select.h> #endif -#include "winsock.h" - +#include <pulsecore/socket.h> #include <pulsecore/core-util.h> #include <pulse/util.h> @@ -187,11 +186,11 @@ int pa_poll (struct pollfd *fds, unsigned long int nfds, int timeout) { * connected socket, a server socket, or something else using a * 0-byte recv, and use ioctl(2) to detect POLLHUP. */ r = recv(f->fd, NULL, 0, MSG_PEEK); - if (r == 0 || (r < 0 && errno == ENOTSOCK)) - ioctl(f->fd, FIONREAD, &r); + if (r == 0 || (r < 0 && errno == ENOTSOCK)) + ioctl(f->fd, FIONREAD, &r); - if (r == 0) - f->revents |= POLLHUP; + if (r == 0) + f->revents |= POLLHUP; #else /* !OS_IS_DARWIN */ if (recv (f->fd, data, 64, MSG_PEEK) == -1) { if (errno == ESHUTDOWN || errno == ECONNRESET || diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c index 3e0bfa3b..369e22ca 100644 --- a/src/pulsecore/pstream.c +++ b/src/pulsecore/pstream.c @@ -28,9 +28,6 @@ #include <stdlib.h> #include <unistd.h> -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif @@ -38,10 +35,9 @@ #include <netinet/in.h> #endif - #include <pulse/xmalloc.h> -#include <pulsecore/winsock.h> +#include <pulsecore/socket.h> #include <pulsecore/queue.h> #include <pulsecore/log.h> #include <pulsecore/core-scache.h> diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c index 2ef78736..98d7d625 100644 --- a/src/pulsecore/rtpoll.c +++ b/src/pulsecore/rtpoll.c @@ -40,7 +40,6 @@ #include <pulsecore/llist.h> #include <pulsecore/flist.h> #include <pulsecore/core-util.h> -#include <pulsecore/winsock.h> #include <pulsecore/ratelimit.h> #include <pulse/rtclock.h> diff --git a/src/pulsecore/socket-client.c b/src/pulsecore/socket-client.c index 7c449bee..31acfd2d 100644 --- a/src/pulsecore/socket-client.c +++ b/src/pulsecore/socket-client.c @@ -32,9 +32,6 @@ #include <string.h> #include <stdlib.h> -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif @@ -56,9 +53,9 @@ #include <pulse/timeval.h> #include <pulse/xmalloc.h> -#include <pulsecore/winsock.h> -#include <pulsecore/core-error.h> +#include <pulsecore/socket.h> #include <pulsecore/socket-util.h> +#include <pulsecore/core-error.h> #include <pulsecore/core-rtclock.h> #include <pulsecore/core-util.h> #include <pulsecore/socket-util.h> diff --git a/src/pulsecore/socket-server.c b/src/pulsecore/socket-server.c index 3b7c6973..e45ded04 100644 --- a/src/pulsecore/socket-server.c +++ b/src/pulsecore/socket-server.c @@ -32,9 +32,6 @@ #include <unistd.h> #include <sys/stat.h> -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #ifndef SUN_LEN @@ -54,18 +51,16 @@ #endif #ifndef HAVE_INET_NTOP -#include "inet_ntop.h" +#include <pulsecore/inet_ntop.h> #endif - #ifndef HAVE_INET_PTON -#include "inet_pton.h" +#include <pulsecore/inet_pton.h> #endif -#include "winsock.h" - #include <pulse/xmalloc.h> #include <pulse/util.h> +#include <pulsecore/socket.h> #include <pulsecore/socket-util.h> #include <pulsecore/core-util.h> #include <pulsecore/log.h> diff --git a/src/pulsecore/socket-util.c b/src/pulsecore/socket-util.c index 2cc9882a..0b16e0f9 100644 --- a/src/pulsecore/socket-util.c +++ b/src/pulsecore/socket-util.c @@ -36,9 +36,6 @@ #include <unistd.h> #include <sys/stat.h> -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif @@ -62,17 +59,16 @@ #endif #ifndef HAVE_INET_NTOP -#include "inet_ntop.h" +#include <pulsecore/inet_ntop.h> #endif -#include "winsock.h" - #include <pulse/xmalloc.h> #include <pulsecore/core-error.h> #include <pulsecore/core-util.h> #include <pulsecore/log.h> #include <pulsecore/macro.h> +#include <pulsecore/socket.h> #include "socket-util.h" diff --git a/src/pulsecore/socket-util.h b/src/pulsecore/socket-util.h index f6d16376..154afd4a 100644 --- a/src/pulsecore/socket-util.h +++ b/src/pulsecore/socket-util.h @@ -24,8 +24,8 @@ ***/ #include <sys/types.h> -#include <sys/socket.h> +#include <pulsecore/socket.h> #include <pulsecore/macro.h> void pa_socket_peer_to_string(int fd, char *c, size_t l); diff --git a/src/pulsecore/winsock.h b/src/pulsecore/socket.h index 0352bf4d..0d38bee6 100644 --- a/src/pulsecore/winsock.h +++ b/src/pulsecore/socket.h @@ -1,5 +1,9 @@ -#ifndef foowinsockhfoo -#define foowinsockhfoo +#ifndef foopulsecoresockethfoo +#define foopulsecoresockethfoo + +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif #ifdef HAVE_WINSOCK2_H #include <winsock2.h> @@ -14,6 +18,7 @@ #define ECONNREFUSED WSAECONNREFUSED #define EHOSTUNREACH WSAEHOSTUNREACH #define EWOULDBLOCK WSAEWOULDBLOCK +#define EADDRINUSE WSAEADDRINUSE typedef long suseconds_t; diff --git a/src/pulsecore/tagstruct.c b/src/pulsecore/tagstruct.c index 330b7596..804b9f90 100644 --- a/src/pulsecore/tagstruct.c +++ b/src/pulsecore/tagstruct.c @@ -35,7 +35,7 @@ #include <pulse/xmalloc.h> -#include <pulsecore/winsock.h> +#include <pulsecore/socket.h> #include <pulsecore/macro.h> #include "tagstruct.h" |