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/socket-util.c | |
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/socket-util.c')
-rw-r--r-- | src/pulsecore/socket-util.c | 8 |
1 files changed, 2 insertions, 6 deletions
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" |