WinCE: cleaning my header inclusion mess

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index c122a8d862547414f70393f7c319168112b34ab5..69bdc178824914445eb9934aa13807060dbf4276 100644 (file)
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -50,7 +50,7 @@ VLC_EXPORT( int, utf8_scandir, ( const char *dirname, char ***namelist, int (*se
 VLC_EXPORT( int, utf8_mkdir, ( const char *filename, mode_t mode ) );
 VLC_EXPORT( int, utf8_unlink, ( const char *filename ) );
 
-#ifdef WIN32
+#if defined( WIN32 ) && !defined( UNDER_CE )
 # define stat _stati64
 #endif
 

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 0c8e3c1fea42b40454eb216c04242fe57407f1ad..d409082f7dd3943b6c3f60071d23806891325c8b 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -376,18 +376,14 @@ typedef struct meta_engine_t meta_engine_t;
 
 /* stat/lstat/fstat */
 #ifdef WIN32
-# ifdef UNDER_CE
-# undef _STAT_DEFINED
-# endif
 #include <sys/stat.h>
+
 # ifndef UNDER_CE
 struct _stati64;
 #define stat _stati64
 #define fstat _fstati64
-# else
-# define stat _stat
-# define fstat _fstat
-# endif
+#endif
+
 /* You should otherwise use utf8_stat and utf8_lstat. */
 #else
 struct stat;