diff options
author | Colin Guthrie <cguthrie@mandriva.org> | 2011-03-20 11:18:19 +0000 |
---|---|---|
committer | Colin Guthrie <cguthrie@mandriva.org> | 2011-03-20 11:18:19 +0000 |
commit | d7ce59de88eda4eb638f977975374359254731f7 (patch) | |
tree | 5baf1627cef783c15b3d339f0d242dcf2a47788c /src/pulsecore/socket-server.c | |
parent | f7acd4bdab7092700a9386802a0ec86d4362e58c (diff) | |
parent | f99b17b825ea7dbf4c2e9ecd490d9b6b54018df3 (diff) |
Merge remote-tracking branch 'mkbosmans/mingw32-build'
Diffstat (limited to 'src/pulsecore/socket-server.c')
-rw-r--r-- | src/pulsecore/socket-server.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/pulsecore/socket-server.c b/src/pulsecore/socket-server.c index e45ded04..23096a0d 100644 --- a/src/pulsecore/socket-server.c +++ b/src/pulsecore/socket-server.c @@ -39,9 +39,6 @@ ((size_t)(((struct sockaddr_un *) 0)->sun_path) + strlen((ptr)->sun_path)) #endif #endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif @@ -50,13 +47,6 @@ #include <tcpd.h> #endif -#ifndef HAVE_INET_NTOP -#include <pulsecore/inet_ntop.h> -#endif -#ifndef HAVE_INET_PTON -#include <pulsecore/inet_pton.h> -#endif - #include <pulse/xmalloc.h> #include <pulse/util.h> @@ -67,6 +57,7 @@ #include <pulsecore/macro.h> #include <pulsecore/core-error.h> #include <pulsecore/refcnt.h> +#include <pulsecore/arpa-inet.h> #include "socket-server.h" |