diff options
| author | Pierre Ossman <ossman@cendio.se> | 2006-01-05 23:13:54 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2006-01-05 23:13:54 +0000 |
| commit | 067c00ff5d3df79829a3b582bb6ac3079c3738de (patch) | |
| tree | b817fa9593beac5706b0565673d659c40e7b6972 | |
| parent | 72795fcaa6778d3612ec04f9e5bde9a0eb2b1682 (diff) | |
Reversing incorrect commit.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/ossman@423 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | polyp/module-protocol-stub.c | 4 | ||||
| -rw-r--r-- | polyp/polyplib-context.c | 4 | ||||
| -rw-r--r-- | polyp/socket-client.c | 4 | ||||
| -rw-r--r-- | polyp/socket-server.c | 5 |
4 files changed, 2 insertions, 15 deletions
diff --git a/polyp/module-protocol-stub.c b/polyp/module-protocol-stub.c index b41515fe..8c06a610 100644 --- a/polyp/module-protocol-stub.c +++ b/polyp/module-protocol-stub.c @@ -62,10 +62,6 @@ #elif defined(USE_TCP6_SOCKETS) #define SOCKET_DESCRIPTION "(TCP/IPv6 sockets)" #define SOCKET_USAGE "port=<TCP port number> loopback=<listen on loopback device only?>" -#ifdef OS_IS_WIN32 -static const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }}; -static const struct in6_addr in6addr_loopback = {{ IN6ADDR_LOOPBACK_INIT }}; -#endif #else #define SOCKET_DESCRIPTION "(UNIX sockets)" #define SOCKET_USAGE "socket=<path to UNIX socket>" diff --git a/polyp/polyplib-context.c b/polyp/polyplib-context.c index fe5b3066..da91995b 100644 --- a/polyp/polyplib-context.c +++ b/polyp/polyplib-context.c @@ -367,12 +367,12 @@ static void setup_context(struct pa_context *c, struct pa_iochannel *io) { assert(!c->pdispatch); c->pdispatch = pa_pdispatch_new(c->mainloop, command_table, PA_COMMAND_MAX); assert(c->pdispatch); -/* + if (!c->conf->cookie_valid) { pa_context_fail(c, PA_ERROR_AUTHKEY); goto finish; } -*/ + t = pa_tagstruct_new(NULL, 0); assert(t); pa_tagstruct_putu32(t, PA_COMMAND_AUTH); diff --git a/polyp/socket-client.c b/polyp/socket-client.c index 201733a1..6d8cb2ab 100644 --- a/polyp/socket-client.c +++ b/polyp/socket-client.c @@ -70,10 +70,6 @@ #define CONNECT_TIMEOUT 5 -#ifdef OS_IS_WIN32 -static const struct in6_addr in6addr_loopback = {{ IN6ADDR_LOOPBACK_INIT }}; -#endif - struct pa_socket_client { int ref; struct pa_mainloop_api *mainloop; diff --git a/polyp/socket-server.c b/polyp/socket-server.c index 2d5e5ac7..c27979da 100644 --- a/polyp/socket-server.c +++ b/polyp/socket-server.c @@ -65,11 +65,6 @@ #include "util.h" #include "log.h" -#ifdef OS_IS_WIN32 -static const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }}; -static const struct in6_addr in6addr_loopback = {{ IN6ADDR_LOOPBACK_INIT }}; -#endif - struct pa_socket_server { int ref; int fd; |