summaryrefslogtreecommitdiffstats
path: root/stream/stream_netstream.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-29 20:05:08 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-29 20:05:08 +0000
commit3af860b877587ab276388956e797a7ad04cd41e3 (patch)
tree72ec51bfb57ae90faf65e7e87aedc870bef31ca8 /stream/stream_netstream.c
parent6c30638aa150adad54c0961e70af25f8014a9ba9 (diff)
downloadmpv-3af860b877587ab276388956e797a7ad04cd41e3.tar.bz2
mpv-3af860b877587ab276388956e797a7ad04cd41e3.tar.xz
Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H.
This is what it is called in FFmpeg and more consistent with other names for similar conditionals. This fixes a potential compilation failure on MinGW, as described in Bugzilla #1262. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27493 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream_netstream.c')
-rw-r--r--stream/stream_netstream.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c
index 4b8119fe96..4a3d2f04ed 100644
--- a/stream/stream_netstream.c
+++ b/stream/stream_netstream.c
@@ -42,7 +42,7 @@
#include <inttypes.h>
#include <errno.h>
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
#define closesocket close
#include <sys/socket.h>
#include <netinet/in.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));