diff options
| author | Colin Guthrie <cguthrie@mandriva.org> | 2011-02-25 09:24:07 +0000 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2011-02-25 09:24:07 +0000 |
| commit | a3dbdb044656e2f3ab9c7ae54fe74b9669155f2d (patch) | |
| tree | d033464ab41e36f04763235160f1024afa0438b7 /src/pulsecore/inet_pton.c | |
| parent | f51889c6f64f11221caba3615bf779fc19d0dd15 (diff) | |
| parent | 821562b9bc8d1a9033daaae0fd5373498a085054 (diff) | |
Merge remote-tracking branch 'mkbosmans/mingw32-build'
Diffstat (limited to 'src/pulsecore/inet_pton.c')
| -rw-r--r-- | src/pulsecore/inet_pton.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/pulsecore/inet_pton.c b/src/pulsecore/inet_pton.c index abdfa467..efb15263 100644 --- a/src/pulsecore/inet_pton.c +++ b/src/pulsecore/inet_pton.c @@ -28,11 +28,8 @@ #ifndef HAVE_INET_PTON -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif - -#include "winsock.h" +#include <pulsecore/macro.h> +#include <pulsecore/socket.h> #include "inet_pton.h" @@ -42,7 +39,8 @@ int inet_pton(int af, const char *src, void *dst) { struct in6_addr *in6 = (struct in6_addr*)dst; #endif - assert(src && dst); + pa_assert(src); + pa_assert(dst); switch (af) { case AF_INET: |