[Mplayer-cvslog] CVS: main/libmpdemux asf_mmst_streaming.c, 1.21, 1.22

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv10526/libmpdemux

Modified Files:
	asf_mmst_streaming.c 
Log Message:
disable iconv in case setlocale is disabled - compile fix

Index: asf_mmst_streaming.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asf_mmst_streaming.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- asf_mmst_streaming.c	26 Jun 2004 09:54:02 -0000	1.21
+++ asf_mmst_streaming.c	26 Jun 2004 09:55:17 -0000	1.22
@@ -22,6 +22,10 @@
 #include <winsock2.h>
 #endif
 
+#ifndef USE_SETLOCAL
+#undef USE_ICONV
+#endif
+
 #ifdef USE_ICONV
 #include <iconv.h>
 #ifdef USE_LANGINFO