summaryrefslogtreecommitdiffstats
path: root/stream/librtsp/rtsp.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/librtsp/rtsp.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/librtsp/rtsp.c')
-rw-r--r--stream/librtsp/rtsp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/librtsp/rtsp.c b/stream/librtsp/rtsp.c
index 89a3b47584..19477fe5b3 100644
--- a/stream/librtsp/rtsp.c
+++ b/stream/librtsp/rtsp.c
@@ -42,7 +42,7 @@
#include <sys/time.h>
#include <sys/types.h>
#include <inttypes.h>
-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
#else
#include <sys/socket.h>
@@ -72,7 +72,7 @@ static int write_stream(int s, const char *buf, int len) {
if (n > 0)
total += n;
else if (n < 0) {
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
if ((timeout>0) && ((errno == EAGAIN) || (errno == EINPROGRESS))) {
#else
if ((timeout>0) && ((errno == EAGAIN) || (WSAGetLastError() == WSAEINPROGRESS))) {