From fb2b4dea1c34e4e75158b5e22b8302d19a090910 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 26 Jul 2008 20:58:50 +0000 Subject: Do not include sys/socket.h when using winsock2, it is pointless and breaks compilation under MinGW. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27352 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/librtsp/rtsp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'stream/librtsp') diff --git a/stream/librtsp/rtsp.c b/stream/librtsp/rtsp.c index d69c684c19..89a3b47584 100644 --- a/stream/librtsp/rtsp.c +++ b/stream/librtsp/rtsp.c @@ -41,10 +41,11 @@ #include #include #include -#include #include #ifdef HAVE_WINSOCK2 #include +#else +#include #endif #include "mp_msg.h" #include "rtsp.h" -- cgit v1.2.3 From 4b141479da70665db8d5780c9ca9e430c9dd1f09 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 30 Jul 2008 12:01:30 +0000 Subject: Start unifying names of internal preprocessor directives. Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/librtsp/rtsp_rtp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'stream/librtsp') diff --git a/stream/librtsp/rtsp_rtp.c b/stream/librtsp/rtsp_rtp.c index 38228cf59e..beda0dac4f 100644 --- a/stream/librtsp/rtsp_rtp.c +++ b/stream/librtsp/rtsp_rtp.c @@ -297,7 +297,7 @@ rtp_connect (char *hostname, int port) sin.sin_addr.s_addr = htonl (INADDR_ANY); else #ifndef HAVE_WINSOCK2 -#ifdef USE_ATON +#ifdef CONFIG_ATON inet_aton (hostname, &sin.sin_addr); #else inet_pton (AF_INET, hostname, &sin.sin_addr); @@ -386,7 +386,7 @@ is_multicast_address (char *addr) sin.sin_family = AF_INET; #ifndef HAVE_WINSOCK2 -#ifdef USE_ATON +#ifdef CONFIG_ATON inet_aton (addr, &sin.sin_addr); #else inet_pton (AF_INET, addr, &sin.sin_addr); -- cgit v1.2.3