diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-01 13:42:27 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-01 13:42:27 +0000 |
| commit | 0f65d3be9d874251c106d8bab3c43b0439ed5526 (patch) | |
| tree | fefdee42e83c5ff220f649c12dcaabff22301fff /stream/librtsp | |
| parent | 12b79487739ffedd9a74940feebe9d4ef11079dc (diff) | |
Convert HAVE_WINSOCK2_H into a 0/1 definition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28437 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 19477fe5b3..8012174d99 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_H +#if 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_H +#if !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 7dc8f6d32c..0d84480a6b 100644 --- a/stream/librtsp/rtsp_rtp.c +++ b/stream/librtsp/rtsp_rtp.c @@ -28,7 +28,7 @@ #include "config.h" -#ifndef HAVE_WINSOCK2_H +#if !HAVE_WINSOCK2_H #include <netdb.h> #include <netinet/in.h> #include <sys/socket.h> @@ -251,7 +251,7 @@ rtcp_connect (int client_port, int server_port, const char* server_hostname) if (bind (s, (struct sockaddr *) &sin, sizeof (sin))) { -#ifndef HAVE_WINSOCK2_H +#if !HAVE_WINSOCK2_H if (errno != EINPROGRESS) #else if (WSAGetLastError() != WSAEINPROGRESS) @@ -297,7 +297,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_H +#if !HAVE_WINSOCK2_H #if HAVE_INET_ATON inet_aton (hostname, &sin.sin_addr); #else @@ -332,7 +332,7 @@ rtp_connect (char *hostname, int port) /* datagram socket */ if (bind (s, (struct sockaddr *) &sin, sizeof (sin))) { -#ifndef HAVE_WINSOCK2_H +#if !HAVE_WINSOCK2_H if (errno != EINPROGRESS) #else if (WSAGetLastError() != WSAEINPROGRESS) @@ -386,7 +386,7 @@ is_multicast_address (char *addr) sin.sin_family = AF_INET; -#ifndef HAVE_WINSOCK2_H +#if !HAVE_WINSOCK2_H #if HAVE_INET_ATON inet_aton (addr, &sin.sin_addr); #else diff --git a/stream/librtsp/rtsp_session.c b/stream/librtsp/rtsp_session.c index ce68dd765f..c196e5305d 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_H +#if !HAVE_WINSOCK2_H #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> |