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/librtsp | |
| parent | 6c30638aa150adad54c0961e70af25f8014a9ba9 (diff) | |
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')
| -rw-r--r-- | stream/librtsp/rtsp.c | 4 | ||||
| -rw-r--r-- | stream/librtsp/rtsp_rtp.c | 10 | ||||
| -rw-r--r-- | stream/librtsp/rtsp_session.c | 2 |
3 files changed, 8 insertions, 8 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))) { diff --git a/stream/librtsp/rtsp_rtp.c b/stream/librtsp/rtsp_rtp.c index b582b1a700..8b3d08ba78 100644 --- a/stream/librtsp/rtsp_rtp.c +++ b/stream/librtsp/rtsp_rtp.c @@ -28,7 +28,7 @@ #include "config.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #include <netdb.h> #include <netinet/in.h> #include <sys/socket.h> @@ -250,7 +250,7 @@ rtcp_connect (int client_port, int server_port, const char* server_hostname) if (bind (s, (struct sockaddr *) &sin, sizeof (sin))) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H if (errno != EINPROGRESS) #else if (WSAGetLastError() != WSAEINPROGRESS) @@ -296,7 +296,7 @@ rtp_connect (char *hostname, int port) if (!hostname || !strcmp (hostname, "0.0.0.0")) sin.sin_addr.s_addr = htonl (INADDR_ANY); else -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #ifdef HAVE_ATON inet_aton (hostname, &sin.sin_addr); #else @@ -331,7 +331,7 @@ rtp_connect (char *hostname, int port) /* datagram socket */ if (bind (s, (struct sockaddr *) &sin, sizeof (sin))) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H if (errno != EINPROGRESS) #else if (WSAGetLastError() != WSAEINPROGRESS) @@ -385,7 +385,7 @@ is_multicast_address (char *addr) sin.sin_family = AF_INET; -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #ifdef HAVE_ATON inet_aton (addr, &sin.sin_addr); #else diff --git a/stream/librtsp/rtsp_session.c b/stream/librtsp/rtsp_session.c index d999323fcd..eab6ae7ba7 100644 --- a/stream/librtsp/rtsp_session.c +++ b/stream/librtsp/rtsp_session.c @@ -30,7 +30,7 @@ #include <sys/types.h> #include "config.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #define closesocket close #include <sys/socket.h> #include <netinet/in.h> |