From 3af860b877587ab276388956e797a7ad04cd41e3 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 29 Aug 2008 20:05:08 +0000 Subject: 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 --- stream/pnm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'stream/pnm.c') diff --git a/stream/pnm.c b/stream/pnm.c index deb3ee8b4c..d9d9513897 100644 --- a/stream/pnm.c +++ b/stream/pnm.c @@ -35,7 +35,7 @@ #include #include #include -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #define closesocket close #include //#include @@ -205,7 +205,7 @@ static int rm_write(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)) { -- cgit v1.2.3