Get ACL:s to work on Win32.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1134 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-07-20 23:21:57 +00:00
parent 40b408990a
commit 09e01afa1f
3 changed files with 51 additions and 13 deletions

View file

@ -228,7 +228,9 @@ get_binary_name_test_CFLAGS = $(AM_CFLAGS)
get_binary_name_test_LDADD = $(AM_LDADD) libpulse.la get_binary_name_test_LDADD = $(AM_LDADD) libpulse.la
get_binary_name_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) 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_CFLAGS = $(AM_CFLAGS)
ipacl_test_LDADD = $(AM_LDADD) libpulsecore.la ipacl_test_LDADD = $(AM_LDADD) libpulsecore.la
ipacl_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) ipacl_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
@ -677,7 +679,8 @@ libsocket_server_la_SOURCES = \
libsocket_server_la_LDFLAGS = -avoid-version libsocket_server_la_LDFLAGS = -avoid-version
libsocket_server_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la libsocket-util.la $(LIBWRAP_LIBS) $(WINSOCK_LIBS) 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_LDFLAGS = -avoid-version
libipacl_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(WINSOCK_LIBS) libipacl_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(WINSOCK_LIBS)

View file

@ -24,18 +24,36 @@
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <sys/types.h> #include <sys/types.h>
#include <arpa/inet.h>
#include <string.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 "winsock.h"
#include <pulse/xmalloc.h>
#include <pulsecore/core-util.h> #include <pulsecore/core-util.h>
#include <pulsecore/llist.h> #include <pulsecore/llist.h>
#include <pulsecore/log.h> #include <pulsecore/log.h>
#include <pulse/xmalloc.h>
#ifndef HAVE_INET_PTON
#include "inet_pton.h"
#endif
#include "ipacl.h" #include "ipacl.h"

View file

@ -1,16 +1,33 @@
/* $Id$ */ /* $Id$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <sys/types.h> #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 <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <arpa/inet.h>
#include <assert.h> #include <assert.h>
#include <string.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> #include <pulsecore/ipacl.h>
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {