Really fix the stat warning (tested on Mingw32)

diff --git a/include/charset.h b/include/charset.h
index f694a8c80a3553e2590962d7919663d5d9af3ec1..f0e637e58a111ea734e68d232e371dda3d434f70 100644 (file)
--- a/include/charset.h
+++ b/include/charset.h
@@ -27,11 +27,6 @@
 
 #include <stdarg.h>
 #include <sys/types.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#else
-struct stat { };
-#endif
 
 VLC_EXPORT( void, LocaleFree, ( const char * ) );
 VLC_EXPORT( char *, FromLocale, ( const char * ) );

diff --git a/include/vlc_common.h b/include/vlc_common.h
index f829027432a5c5fc4043be6406d8268e2273fa5b..d6bde06dd319373b2f18c72f654c79a89c707628 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -449,7 +449,11 @@ typedef struct meta_engine_t meta_engine_t;
 
 /* stat/lstat/fstat */
 #ifdef WIN32
+#include <sys/stat.h>
 struct _stati64;
+#define stat _stati64
+#define fstat _fstati64
+/* You should otherwise use utf8_stat and utf8_lstat. */
 #else
 struct stat;
 #endif

diff --git a/modules/access/file.c b/modules/access/file.c
index 572f406a6cfada8c14984eac228d00e62ccc72e5..96fa259876b3118f1f8a298cc0232a538a2d2bc3 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -51,8 +51,6 @@
 #endif
 
 #if defined( WIN32 ) && !defined( UNDER_CE )
-/* fstat() support for large files on win32 */
-#   define fstat(a,b) _fstati64(a,b)
 #   ifdef lseek
 #      undef lseek
 #   endif