diff options
| -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 | ||||
| -rw-r--r-- | polyp/util.c | 2 |
5 files changed, 16 insertions, 3 deletions
diff --git a/polyp/module-protocol-stub.c b/polyp/module-protocol-stub.c index 8c06a610..b41515fe 100644 --- a/polyp/module-protocol-stub.c +++ b/polyp/module-protocol-stub.c @@ -62,6 +62,10 @@ #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 da91995b..fe5b3066 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 6d8cb2ab..201733a1 100644 --- a/polyp/socket-client.c +++ b/polyp/socket-client.c @@ -70,6 +70,10 @@ #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 c27979da..2d5e5ac7 100644 --- a/polyp/socket-server.c +++ b/polyp/socket-server.c @@ -65,6 +65,11 @@ #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; diff --git a/polyp/util.c b/polyp/util.c index 0495896f..ff27430a 100644 --- a/polyp/util.c +++ b/polyp/util.c @@ -773,7 +773,7 @@ finish: /* Check the current user is member of the specified group */ int pa_uid_in_group(const char *name, gid_t *gid) { gid_t *gids, tgid; - long n = sysconf(_SC_NGROUPS_MAX); + GETGROUPS_T n = sysconf(_SC_NGROUPS_MAX); int r = -1, i; assert(n > 0); |