From 21272e4f1caa9d0b3fe81f68929e8bbba125a977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?=
 <valtri@users.sourceforge.net>
Date: Sun, 29 Feb 2004 17:26:45 +0000
Subject: Various compilation fixes and updates:  - xine compilable without
 iconv (scream if I something broke)  - update MSVC port, fixes in avi demux 
 - add iff.h into makefiles  - ffmpeg depends on zlib (build was OK only when
 freetype was installed)  - commit a patch for goom

CVS patchset: 6192
CVS date: 2004/02/29 17:26:45
---
 src/input/mms.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/input')

diff --git a/src/input/mms.c b/src/input/mms.c
index 7c5afc13f..3fd7066f2 100644
--- a/src/input/mms.c
+++ b/src/input/mms.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2003 the xine project
+ * Copyright (C) 2002-2004 the xine project
  * 
  * This file is part of xine, a free video player.
  * 
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: mms.c,v 1.40 2003/12/11 01:15:53 tmattern Exp $
+ * $Id: mms.c,v 1.41 2004/02/29 17:26:49 valtri Exp $
  *
  * MMS over TCP protocol
  *   based on work from major mms
@@ -46,7 +46,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#if !defined(_MSC_VER) && defined(HAVE_LANGINFO_CODESET)
+#if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_CODESET)
 #define USE_ICONV
 #include <iconv.h>
 #include <locale.h>
-- 
cgit v1.2.3