diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-12-10 22:49:27 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-12-10 22:49:27 +0000 |
| commit | 471aee5bb21bb5d568ac1ddaea0b35c18cda5c07 (patch) | |
| tree | 77d42d4a0c337d4001d100b49b785f2604deeb0e /src/input/input_net.c | |
| parent | c6324255117128d3a7a9f614c756022d3ef7461d (diff) | |
| parent | 508e9088eec8f00b5dea9571383480803d4ad45e (diff) | |
| download | xine-lib-471aee5bb21bb5d568ac1ddaea0b35c18cda5c07.tar.gz xine-lib-471aee5bb21bb5d568ac1ddaea0b35c18cda5c07.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/liba52/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
rename : src/libxinevdec/image.c => src/video_dec/image.c
Diffstat (limited to 'src/input/input_net.c')
| -rw-r--r-- | src/input/input_net.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/input/input_net.c b/src/input/input_net.c index cd4a8c901..801093e96 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -113,7 +113,10 @@ typedef struct { static int host_connect_attempt_ipv4(struct in_addr ia, int port, xine_t *xine) { int s; - struct sockaddr_in sin; + union { + struct sockaddr_in in; + struct sockaddr sa; + } sa; s = xine_socket_cloexec(PF_INET, SOCK_STREAM, IPPROTO_TCP); if (s==-1) { @@ -122,14 +125,14 @@ static int host_connect_attempt_ipv4(struct in_addr ia, int port, xine_t *xine) return -1; } - sin.sin_family = AF_INET; - sin.sin_addr = ia; - sin.sin_port = htons(port); + sa.in.sin_family = AF_INET; + sa.in.sin_addr = ia; + sa.in.sin_port = htons(port); #ifndef WIN32 - if (connect(s, (struct sockaddr *)&sin, sizeof(sin))==-1 && errno != EINPROGRESS) + if (connect(s, &sa.sa, sizeof(sa.in))==-1 && errno != EINPROGRESS) #else - if (connect(s, (struct sockaddr *)&sin, sizeof(sin))==-1 && WSAGetLastError() != WSAEINPROGRESS) + if (connect(s, &sa.sa, sizeof(sa.in))==-1 && WSAGetLastError() != WSAEINPROGRESS) #endif { xine_log(xine, XINE_LOG_MSG, |