* A few additional MSVC build fixes.

Makefile.am

@@ -284,8 +284,9 @@ EXTRA_DIST += \
 # rule to rebuild vlc.dsp - not for the faint of heart
 #
 update-vlc.dsp: FORCE
+	rm -f msvc/vlc.dsp
 #	Top of the project file
-	cat msvc/vlc.dsp.in >| msvc/vlc.dsp
+	cat msvc/vlc.dsp.in > msvc/vlc.dsp
 #	The source files
 	echo '# Begin Group "Source Files"
' >> msvc/vlc.dsp
 	echo '# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
' >> msvc/vlc.dsp
@@ -297,15 +298,15 @@ update-vlc.dsp: FORCE
 	done ; \
 	echo '# End Group
' >> msvc/vlc.dsp
 	echo '# Begin Group "libvlc"
' >> msvc/vlc.dsp
-	for file in `for i in $(SOURCES_libvlc) $(OPT_SOURCES_libvlc_win32) $(OPT_SOURCES_libvlc_direntt) $(OPT_SOURCES_libvlc_getopt) ; do echo $$i ; done | grep -v "/.*/"` ; do \
+	for file in `for i in $(SOURCES_libvlc) $(OPT_SOURCES_libvlc_win32) $(OPT_SOURCES_libvlc_dirent) $(OPT_SOURCES_libvlc_getopt) ; do echo $$i ; done | grep -v "/.*/"` ; do \
 		echo '# Begin Source File
' >> msvc/vlc.dsp ; \
 		echo $$file | sed -e 's%/%\\%g' -e 's%.*%SOURCE="..\\&"
%' >> msvc/vlc.dsp ; \
 		echo '# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\"
' >> msvc/vlc.dsp ; \
 		echo '# End Source File
' >> msvc/vlc.dsp ; \
 	done ; \
-	for subdir in `for i in $(SOURCES_libvlc) $(OPT_SOURCES_libvlc_win32) $(OPT_SOURCES_libvlc_direntt) $(OPT_SOURCES_libvlc_getopt) ; do echo $$i ; done | grep "/.*/" | cut -f2 -d/ | sort | uniq` ; do \
+	for subdir in `for i in $(SOURCES_libvlc) $(OPT_SOURCES_libvlc_win32) $(OPT_SOURCES_libvlc_dirent) $(OPT_SOURCES_libvlc_getopt) ; do echo $$i ; done | grep "/.*/" | cut -f2 -d/ | sort | uniq` ; do \
 		echo '# Begin Group "'$$subdir'"
' >> msvc/vlc.dsp ; \
-		for file in `for i in $(SOURCES_libvlc) $(OPT_SOURCES_libvlc_win32) $(OPT_SOURCES_libvlc_direntt) $(OPT_SOURCES_libvlc_getopt) ; do echo $$i ; done | grep "/$$subdir/"` ; do \
+		for file in `for i in $(SOURCES_libvlc) $(OPT_SOURCES_libvlc_win32) $(OPT_SOURCES_libvlc_dirent) $(OPT_SOURCES_libvlc_getopt) ; do echo $$i ; done | grep "/$$subdir/"` ; do \
 			echo '# Begin Source File
' >> msvc/vlc.dsp ; \
 			echo $$file | sed -e 's%/%\\%g' -e 's%.*%SOURCE="..\\&"
%' >> msvc/vlc.dsp ; \
 			echo '# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\"
' >> msvc/vlc.dsp ; \

configure.ac.in

@@ -218,7 +218,7 @@ AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab
 
 dnl Check for strndup
 need_strndup=false
-AC_CHECK_FUNC(strndup,,[need_strndup=:])
+AC_CHECK_FUNCS(strndup,,[need_strndup=:])
 AM_CONDITIONAL(BUILD_STRNDUP, ${need_strndup})
 
 AC_CHECK_FUNC(connect,,[
@@ -327,7 +327,7 @@ AC_HEADER_TIME
 
 dnl Check for dirent
 need_dirent=false
-AC_CHECK_HEADER(dirent.h,,[need_dirent=:])
+AC_CHECK_HEADERS(dirent.h,,[need_dirent=:])
 AM_CONDITIONAL(BUILD_DIRENT, ${need_dirent})
 
 dnl Mac OS X and other OSes don't have declaration for nanosleep

src/extras/dirent.c

@@ -9,9 +9,9 @@
  * Significantly revised and rewinddir, seekdir and telldir added by Colin
  * Peters <colin@fu.is.saga-u.ac.jp>
  *	
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
  * $Author: sam $
- * $Date: 2002/11/09 16:34:52 $
+ * $Date: 2002/11/09 17:44:09 $
  *
  */
 
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <io.h>
 #include <direct.h>
-#include <dirent.h>
+#include "dirent.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h> /* for GetFileAttributes */

src/libvlc.c

@@ -2,7 +2,7 @@
  * libvlc.c: main libvlc source
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.43 2002/11/06 09:26:25 sam Exp $
+ * $Id: libvlc.c,v 1.44 2002/11/09 17:44:08 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -51,7 +51,7 @@
 #endif
 
 #ifdef WIN32                       /* optind, getopt(), included in unistd.h */
-#   include "extras/GNUgetopt/getopt.h"
+#   include "extras/getopt.h"
 #endif
 
 #ifdef HAVE_LOCALE_H

src/misc/configuration.c

@@ -2,7 +2,7 @@
  * configuration.c management of the modules configuration
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.41 2002/10/08 18:10:10 sam Exp $
+ * $Id: configuration.c,v 1.42 2002/11/09 17:44:09 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -37,7 +37,7 @@
 #       include <getopt.h>                                       /* getopt() */
 #   endif
 #else
-#   include "extras/GNUgetopt/getopt.h"
+#   include "../extras/getopt.h"
 #endif
 
 #if defined(HAVE_GETPWUID)

src/misc/modules.c

@@ -2,7 +2,7 @@
  * modules.c : Builtin and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.100 2002/10/31 11:16:30 sam Exp $
+ * $Id: modules.c,v 1.101 2002/11/09 17:44:09 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -35,7 +35,12 @@
 
 #include <vlc/vlc.h>
 
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+#   include <dirent.h>
+#else
+#   include "../extras/dirent.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
@@ -616,7 +621,7 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir,
     while( (file = readdir( dir )) )
     {
         struct stat statbuf;
-        int i_len;
+        unsigned int i_len;
 
         /* Skip ".", ".." and anything starting with "." */
         if( !*file->d_name || *file->d_name == '.' )