diff stream/asf_mmst_streaming.c @ 27393:4876c89bafdd

Rename font-related preprocessor directives. Switch them from a HAVE_ to a CONFIG_ prefix.

--- a/stream/asf_mmst_streaming.c	Thu Aug 07 09:53:59 2008 +0000
+++ b/stream/asf_mmst_streaming.c	Thu Aug 07 10:36:07 2008 +0000
@@ -46,10 +46,10 @@
 #endif
 
 #ifndef CONFIG_SETLOCALE
-#undef HAVE_ICONV
+#undef CONFIG_ICONV
 #endif
 
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
 #include <iconv.h>
 #ifdef HAVE_LANGINFO
 #include <langinfo.h>
@@ -143,13 +143,13 @@
   }
 }
 
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
 static iconv_t url_conv;
 #endif
 
 static void string_utf16(char *dest, char *src, int len) {
     int i;
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
     size_t len1, len2;
     char *ip, *op;
 
@@ -172,7 +172,7 @@
 	/* trailing zeroes */
 	dest[i*2] = 0;
 	dest[i*2+1] = 0;
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
     }
 #endif
 }
@@ -575,7 +575,7 @@
   * */
 
   /* prepare for the url encoding conversion */
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
 #ifdef HAVE_LANGINFO
   url_conv = iconv_open("UTF-16LE",nl_langinfo(CODESET));
 #else
@@ -690,7 +690,7 @@
   packet_length1 = packet_length;
   mp_msg(MSGT_NETWORK,MSGL_INFO,"mmst packet_length = %d\n", packet_length);
 
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
   if (url_conv != (iconv_t)(-1))
     iconv_close(url_conv);
 #endif