diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
| commit | b56858342fdbe48489618107df75e5bd0451eb0b (patch) | |
| tree | 5d41ef858502bae99dcbebdd728d42a6040adb03 /stream/stream_netstream.c | |
| parent | 8ea7eb77fc7ba8bd0b596ea32ee60909a012828f (diff) | |
| parent | bae94777d7ddaa2d4763507fdb93b9520327c9d1 (diff) | |
| download | mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.bz2 mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.xz | |
Merge svn changes up to r27514
Diffstat (limited to 'stream/stream_netstream.c')
| -rw-r--r-- | stream/stream_netstream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c index a514a897c0..f9c70e72ba 100644 --- a/stream/stream_netstream.c +++ b/stream/stream_netstream.c @@ -42,8 +42,7 @@ #include <inttypes.h> #include <errno.h> -#ifndef HAVE_WINSOCK2 -#define closesocket close +#ifndef HAVE_WINSOCK2_H #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -59,6 +58,7 @@ #include "libavutil/common.h" #include "mpbswap.h" +#include "network.h" #include "netstream.h" #include "tcp.h" @@ -90,7 +90,7 @@ static const struct m_struct_st stream_opts = { //// When the cache is running we need a lock as //// fill_buffer is called from another proccess static int lock_fd(int fd) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H struct flock lock; memset(&lock,0,sizeof(struct flock)); @@ -113,7 +113,7 @@ printf("FIXME? should lock here\n"); } static int unlock_fd(int fd) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H struct flock lock; memset(&lock,0,sizeof(struct flock)); |