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/ipacl.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/ipacl.c')
| -rw-r--r-- | src/pulsecore/ipacl.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/pulsecore/ipacl.c b/src/pulsecore/ipacl.c index 312e04037..0cbe34af0 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" |