Mercurial > mplayer.hg

changeset 12675:7c5dee73a7dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disable iconv in case setlocale is disabled - compile fix
author alex
date Sat, 26 Jun 2004 09:55:17 +0000
parents 0392f36045f4
children 798cd7420e79
files libmpdemux/asf_mmst_streaming.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/asf_mmst_streaming.c	Sat Jun 26 09:54:02 2004 +0000
+++ b/libmpdemux/asf_mmst_streaming.c	Sat Jun 26 09:55:17 2004 +0000
@@ -22,6 +22,10 @@
 #include <winsock2.h>
 #endif
 
+#ifndef USE_SETLOCAL
+#undef USE_ICONV
+#endif
+
 #ifdef USE_ICONV
 #include <iconv.h>
 #ifdef USE_LANGINFO