summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-27 17:40:57 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-27 17:40:57 +0200
commitc1b80dcbbb34d63df65c0f52c0bede66dfa225e8 (patch)
tree2b929ffa6f2896bdee81729ceab2b9651c62055f /stream
parenta76f59b0390a408de0a666cb1edfc578b734596a (diff)
parent4f6c6ba61a1fc213c7356b9ae1b9467f177a67a5 (diff)
downloadmpv-c1b80dcbbb34d63df65c0f52c0bede66dfa225e8.tar.bz2
mpv-c1b80dcbbb34d63df65c0f52c0bede66dfa225e8.tar.xz
Merge svn changes up to r28204
Diffstat (limited to 'stream')
-rw-r--r--stream/tcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/tcp.c b/stream/tcp.c
index fd5a849cad..69072f80fa 100644
--- a/stream/tcp.c
+++ b/stream/tcp.c
@@ -76,7 +76,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
char buf[255];
#ifdef HAVE_WINSOCK2_H
- u_long val;
+ unsigned long val;
int to;
#else
struct timeval to;