From 4f1d4044f8409ff29eeb7f97324daba496e40714 Mon Sep 17 00:00:00 2001
From: Maarten Bosmans <mkbosmans@gmail.com>
Date: Tue, 4 Jan 2011 17:03:13 +0100
Subject: 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)
---
 src/pulsecore/inet_ntop.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/pulsecore/inet_ntop.c')

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"
 
-- 
cgit 


From 2de2c735c937c6724c14656acf01ce90f122b903 Mon Sep 17 00:00:00 2001
From: Maarten Bosmans <mkbosmans@gmail.com>
Date: Thu, 6 Jan 2011 01:35:27 +0100
Subject: Fix dependencies and include necessary headers

---
 src/pulsecore/inet_ntop.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/pulsecore/inet_ntop.c')

diff --git a/src/pulsecore/inet_ntop.c b/src/pulsecore/inet_ntop.c
index e283a670..64c28edb 100644
--- a/src/pulsecore/inet_ntop.c
+++ b/src/pulsecore/inet_ntop.c
@@ -28,6 +28,7 @@
 
 #ifndef HAVE_INET_NTOP
 
+#include <pulsecore/core-util.h>
 #include <pulsecore/socket.h>
 
 #include "inet_ntop.h"
-- 
cgit 


From aebf66bef6ebc8561b3cd4bfb4189ea739056f65 Mon Sep 17 00:00:00 2001
From: Maarten Bosmans <mkbosmans@gmail.com>
Date: Thu, 17 Feb 2011 11:50:10 +0100
Subject: Use pa_* instead of generic functions to improve portability

---
 src/pulsecore/inet_ntop.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/pulsecore/inet_ntop.c')

diff --git a/src/pulsecore/inet_ntop.c b/src/pulsecore/inet_ntop.c
index 64c28edb..059b25cc 100644
--- a/src/pulsecore/inet_ntop.c
+++ b/src/pulsecore/inet_ntop.c
@@ -29,6 +29,7 @@
 #ifndef HAVE_INET_NTOP
 
 #include <pulsecore/core-util.h>
+#include <pulsecore/macro.h>
 #include <pulsecore/socket.h>
 
 #include "inet_ntop.h"
@@ -39,7 +40,8 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) {
     struct in6_addr *in6 = (struct in6_addr*)src;
 #endif
 
-    assert(src && dst);
+    pa_assert(src);
+    pa_assert(dst);
 
     switch (af) {
     case AF_INET:
-- 
cgit