summaryrefslogtreecommitdiffstats
path: root/stream/stream.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.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.c')
-rw-r--r--stream/stream.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/stream.c b/stream/stream.c
index 041fd0b2d1..9b58c670f2 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -14,7 +14,7 @@
#include "config.h"
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
#define closesocket close
#else
#include <winsock2.h>
@@ -410,7 +410,7 @@ stream_t* new_stream(int fd,int type){
if(s==NULL) return NULL;
memset(s,0,sizeof(stream_t));
-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H
{
WSADATA wsdata;
int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later)
@@ -445,7 +445,7 @@ void free_stream(stream_t *s){
closesocket(s->fd);
else close(s->fd);
}
-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H
mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n");
WSACleanup(); // there might be a better place for this (-> later)
#endif