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_netstream.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_netstream.c')
-rw-r--r-- | stream/stream_netstream.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c index 5c68defe73..593e60bd97 100644 --- a/stream/stream_netstream.c +++ b/stream/stream_netstream.c @@ -42,7 +42,7 @@ #include <inttypes.h> #include <errno.h> -#ifndef HAVE_WINSOCK2_H +#if !HAVE_WINSOCK2_H #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.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_H +#if !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_H +#if !HAVE_WINSOCK2_H struct flock lock; memset(&lock,0,sizeof(struct flock)); |