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_pton.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

diff --git a/src/pulsecore/inet_pton.c b/src/pulsecore/inet_pton.c
index abdfa467..198d1a0d 100644
--- a/src/pulsecore/inet_pton.c
+++ b/src/pulsecore/inet_pton.c
@@ -28,11 +28,7 @@
 
 #ifndef HAVE_INET_PTON
 
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#include "winsock.h"
+#include <pulsecore/socket.h>
 
 #include "inet_pton.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_pton.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/src/pulsecore/inet_pton.c b/src/pulsecore/inet_pton.c
index 198d1a0d..efb15263 100644
--- a/src/pulsecore/inet_pton.c
+++ b/src/pulsecore/inet_pton.c
@@ -28,6 +28,7 @@
 
 #ifndef HAVE_INET_PTON
 
+#include <pulsecore/macro.h>
 #include <pulsecore/socket.h>
 
 #include "inet_pton.h"
@@ -38,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:
-- 
cgit