[pulseaudio-commits] r1134 - in /trunk/src: Makefile.am pulsecore/ipacl.c tests/ipacl-test.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Fri Jul 21 01:21:57 2006
New Revision: 1134

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1134&root=pulseaudio&view=rev
Log:
Get ACL:s to work on Win32.

Modified:
    trunk/src/Makefile.am
    trunk/src/pulsecore/ipacl.c
    trunk/src/tests/ipacl-test.c

Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=1134&root=pulseaudio&r1=1133&r2=1134&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Fri Jul 21 01:21:57 2006
@@ -228,7 +228,9 @@
 get_binary_name_test_LDADD = $(AM_LDADD) libpulse.la
 get_binary_name_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-ipacl_test_SOURCES = tests/ipacl-test.c pulsecore/ipacl.c pulsecore/ipacl.h
+ipacl_test_SOURCES = tests/ipacl-test.c \
+		pulsecore/ipacl.c pulsecore/ipacl.h \
+		pulsecore/inet_pton.c pulsecore/inet_pton.h
 ipacl_test_CFLAGS = $(AM_CFLAGS)
 ipacl_test_LDADD = $(AM_LDADD) libpulsecore.la
 ipacl_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
@@ -677,7 +679,8 @@
 libsocket_server_la_LDFLAGS = -avoid-version
 libsocket_server_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la libsocket-util.la $(LIBWRAP_LIBS) $(WINSOCK_LIBS)
 
-libipacl_la_SOURCES = pulsecore/ipacl.h pulsecore/ipacl.c
+libipacl_la_SOURCES = pulsecore/ipacl.h pulsecore/ipacl.c \
+		pulsecore/inet_pton.c pulsecore/inet_pton.h
 libipacl_la_LDFLAGS = -avoid-version
 libipacl_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(WINSOCK_LIBS)
 

Modified: trunk/src/pulsecore/ipacl.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/ipacl.c?rev=1134&root=pulseaudio&r1=1133&r2=1134&view=diff
==============================================================================
--- trunk/src/pulsecore/ipacl.c (original)
+++ trunk/src/pulsecore/ipacl.c Fri Jul 21 01:21:57 2006
@@ -24,18 +24,36 @@
 #endif
 
 #include <sys/types.h>
+#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
+#ifdef HAVE_NETINET_IN_SYSTM_H
 #include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_IP_H
 #include <netinet/ip.h>
-#include <sys/types.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
-#include <string.h>
+#endif
+
+#include "winsock.h"
+
+#include <pulse/xmalloc.h>
 
 #include <pulsecore/core-util.h>
 #include <pulsecore/llist.h>
 #include <pulsecore/log.h>
-#include <pulse/xmalloc.h>
+
+#ifndef HAVE_INET_PTON
+#include "inet_pton.h"
+#endif
 
 #include "ipacl.h"
 

Modified: trunk/src/tests/ipacl-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/ipacl-test.c?rev=1134&root=pulseaudio&r1=1133&r2=1134&view=diff
==============================================================================
--- trunk/src/tests/ipacl-test.c (original)
+++ trunk/src/tests/ipacl-test.c Fri Jul 21 01:21:57 2006
@@ -1,15 +1,32 @@
 /* $Id$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <arpa/inet.h>
 #include <assert.h>
 #include <string.h>
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_IP_H
+#include <netinet/ip.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#include "../pulsecore/winsock.h"
 
 #include <pulsecore/ipacl.h>