From d17f9943af8aeeca65b327ad22475b4df36a3b2d Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 1 Aug 2008 20:28:58 +0000
Subject: Rename some preprocessor directives from CONFIG_* to HAVE_* where
 appropriate; CONFIG_ prefix for configurable options, HAVE_ for
 system-dependent stuff.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/asf_mmst_streaming.c | 18 +++++++++---------
 stream/librtsp/rtsp_rtp.c   |  4 ++--
 stream/tcp.c                |  4 ++--
 stream/udp.c                |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'stream')

diff --git a/stream/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c
index 2ce21f481a..2ca7876ad8 100644
--- a/stream/asf_mmst_streaming.c
+++ b/stream/asf_mmst_streaming.c
@@ -46,12 +46,12 @@
 #endif
 
 #ifndef CONFIG_SETLOCALE
-#undef CONFIG_ICONV
+#undef HAVE_ICONV
 #endif
 
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
 #include <iconv.h>
-#ifdef CONFIG_LANGINFO
+#ifdef HAVE_LANGINFO
 #include <langinfo.h>
 #endif
 #endif
@@ -143,13 +143,13 @@ static void send_command (int s, int command, uint32_t switches,
   }
 }
 
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
 static iconv_t url_conv;
 #endif
 
 static void string_utf16(char *dest, char *src, int len) {
     int i;
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
     size_t len1, len2;
     char *ip, *op;
 
@@ -172,7 +172,7 @@ static void string_utf16(char *dest, char *src, int len) {
 	/* trailing zeroes */
 	dest[i*2] = 0;
 	dest[i*2+1] = 0;
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
     }
 #endif
 }
@@ -575,8 +575,8 @@ int asf_mmst_streaming_start(stream_t *stream)
   * */
 
   /* prepare for the url encoding conversion */
-#ifdef CONFIG_ICONV
-#ifdef CONFIG_LANGINFO
+#ifdef HAVE_ICONV
+#ifdef HAVE_LANGINFO
   url_conv = iconv_open("UTF-16LE",nl_langinfo(CODESET));
 #else
   url_conv = iconv_open("UTF-16LE", NULL);
@@ -690,7 +690,7 @@ int asf_mmst_streaming_start(stream_t *stream)
   packet_length1 = packet_length;
   mp_msg(MSGT_NETWORK,MSGL_INFO,"mmst packet_length = %d\n", packet_length);
 
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
   if (url_conv != (iconv_t)(-1))
     iconv_close(url_conv);
 #endif
diff --git a/stream/librtsp/rtsp_rtp.c b/stream/librtsp/rtsp_rtp.c
index beda0dac4f..b582b1a700 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 CONFIG_ATON
+#ifdef HAVE_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 CONFIG_ATON
+#ifdef HAVE_ATON
     inet_aton (addr, &sin.sin_addr);
 #else
     inet_pton (AF_INET, addr, &sin.sin_addr);
diff --git a/stream/tcp.c b/stream/tcp.c
index f4c71f651d..950c434886 100644
--- a/stream/tcp.c
+++ b/stream/tcp.c
@@ -116,7 +116,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
 	memset(&server_address, 0, sizeof(server_address));
 	
 #ifndef HAVE_WINSOCK2
-#ifdef CONFIG_ATON
+#ifdef HAVE_ATON
 	if (inet_aton(host, our_s_addr)!=1)
 #else
 	if (inet_pton(af, host, our_s_addr)!=1)
@@ -164,7 +164,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
 			return TCP_ERROR_FATAL;
 	}
 
-#if defined(CONFIG_ATON) || defined(HAVE_WINSOCK2)
+#if defined(HAVE_ATON) || defined(HAVE_WINSOCK2)
 	strncpy( buf, inet_ntoa( *((struct in_addr*)our_s_addr) ), 255);
 #else
 	inet_ntop(af, our_s_addr, buf, 255);
diff --git a/stream/udp.c b/stream/udp.c
index 7ad2542ba1..759c5a9675 100644
--- a/stream/udp.c
+++ b/stream/udp.c
@@ -92,11 +92,11 @@ udp_open_socket (URL_t *url)
   else
   {
 #ifndef HAVE_WINSOCK2
-#ifdef CONFIG_ATON
+#ifdef HAVE_ATON
     inet_aton (url->hostname, &server_address.sin_addr);
 #else
     inet_pton (AF_INET, url->hostname, &server_address.sin_addr);
-#endif /* CONFIG_ATON */
+#endif /* HAVE_ATON */
 #else
     server_address.sin_addr.s_addr = htonl(INADDR_ANY);
 #endif /* HAVE_WINSOCK2 */
-- 
cgit v1.2.3