diff options
| author | Colin Guthrie <cguthrie@mandriva.org> | 2011-02-25 09:24:07 +0000 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2011-02-25 09:24:07 +0000 |
| commit | a3dbdb044656e2f3ab9c7ae54fe74b9669155f2d (patch) | |
| tree | d033464ab41e36f04763235160f1024afa0438b7 /src/pulsecore/socket-client.c | |
| parent | f51889c6f64f11221caba3615bf779fc19d0dd15 (diff) | |
| parent | 821562b9bc8d1a9033daaae0fd5373498a085054 (diff) | |
Merge remote-tracking branch 'mkbosmans/mingw32-build'
Diffstat (limited to 'src/pulsecore/socket-client.c')
| -rw-r--r-- | src/pulsecore/socket-client.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/pulsecore/socket-client.c b/src/pulsecore/socket-client.c index 7c449bee..ae7abc9e 100644 --- a/src/pulsecore/socket-client.c +++ b/src/pulsecore/socket-client.c @@ -32,9 +32,6 @@ #include <string.h> #include <stdlib.h> -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif @@ -56,9 +53,9 @@ #include <pulse/timeval.h> #include <pulse/xmalloc.h> -#include <pulsecore/winsock.h> -#include <pulsecore/core-error.h> +#include <pulsecore/socket.h> #include <pulsecore/socket-util.h> +#include <pulsecore/core-error.h> #include <pulsecore/core-rtclock.h> #include <pulsecore/core-util.h> #include <pulsecore/socket-util.h> @@ -525,7 +522,7 @@ pa_socket_client* pa_socket_client_new_string(pa_mainloop_api *m, pa_bool_t use_ if (!host) goto finish; - pa_zero(sa); + pa_zero(s); s.sin_family = AF_INET; memcpy(&s.sin_addr, host->h_addr, sizeof(struct in_addr)); s.sin_port = htons(a.port); |