diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-04 00:28:17 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-04 00:28:17 +0200 |
| commit | 9790f4e6e72cdc8093be966d3d6e007c8f44a035 (patch) | |
| tree | 3d4a19a910d34be6ee7cd4841876a4318d5c243d /stream/stream.c | |
| parent | ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3 (diff) | |
| parent | 09bf506c34a73d587c999ce161a0714159e1e5b6 (diff) | |
| download | mpv-9790f4e6e72cdc8093be966d3d6e007c8f44a035.tar.bz2 mpv-9790f4e6e72cdc8093be966d3d6e007c8f44a035.tar.xz | |
Merge svn changes up to r28461
Diffstat (limited to 'stream/stream.c')
| -rw-r--r-- | stream/stream.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/stream.c b/stream/stream.c index 1431fa123a..7688006896 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -14,7 +14,7 @@ #include "config.h" -#ifdef HAVE_WINSOCK2_H +#if HAVE_WINSOCK2_H #include <winsock2.h> #endif @@ -406,7 +406,7 @@ stream_t* new_stream(int fd,int type){ if(s==NULL) return NULL; memset(s,0,sizeof(stream_t)); -#ifdef HAVE_WINSOCK2_H +#if HAVE_WINSOCK2_H { WSADATA wsdata; int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later) @@ -441,7 +441,7 @@ void free_stream(stream_t *s){ closesocket(s->fd); else close(s->fd); } -#ifdef HAVE_WINSOCK2_H +#if HAVE_WINSOCK2_H mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n"); WSACleanup(); // there might be a better place for this (-> later) #endif |