diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-29 20:05:08 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-29 20:05:08 +0000 |
| commit | 3af860b877587ab276388956e797a7ad04cd41e3 (patch) | |
| tree | 72ec51bfb57ae90faf65e7e87aedc870bef31ca8 /stream/pnm.c | |
| parent | 6c30638aa150adad54c0961e70af25f8014a9ba9 (diff) | |
| download | mpv-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/pnm.c')
| -rw-r--r-- | stream/pnm.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 <stdlib.h> #include <sys/time.h> #include <inttypes.h> -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #define closesocket close #include <sys/socket.h> //#include <netinet/in.h> @@ -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)) { |