diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-07 10:36:07 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-07 10:36:07 +0000 |
| commit | 091d352d065442817aa05c2f61910366004405be (patch) | |
| tree | 9f9101aac327a41f88a3828a19cf6f2e5f4d4fc9 /stream | |
| parent | dba246199c20857d29a08bf176003b58736da31c (diff) | |
| download | mpv-091d352d065442817aa05c2f61910366004405be.tar.bz2 mpv-091d352d065442817aa05c2f61910366004405be.tar.xz | |
Rename font-related preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/asf_mmst_streaming.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/stream/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c index 2ca7876ad8..bc0ac277f3 100644 --- a/stream/asf_mmst_streaming.c +++ b/stream/asf_mmst_streaming.c @@ -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 @@ static void send_command (int s, int command, uint32_t switches, } } -#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 @@ static void string_utf16(char *dest, char *src, int len) { /* trailing zeroes */ dest[i*2] = 0; dest[i*2+1] = 0; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV } #endif } @@ -575,7 +575,7 @@ int asf_mmst_streaming_start(stream_t *stream) * */ /* 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 @@ 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 HAVE_ICONV +#ifdef CONFIG_ICONV if (url_conv != (iconv_t)(-1)) iconv_close(url_conv); #endif |