[vlc-devel] commit: WinCE: cleaning my header inclusion mess (Geoffroy Couprie )

[git version control]

vlc | branch: master | Geoffroy Couprie <geo.couprie at gmail.com> | Mon Sep 29 18:52:20 2008 +0200| [e53c94ea141f5e61cb0a0393744e4b3b7991a94d] | committer: Geoffroy Couprie 

WinCE: cleaning my header inclusion mess

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e53c94ea141f5e61cb0a0393744e4b3b7991a94d
---

 include/vlc_charset.h |    2 +-
 include/vlc_common.h  |   10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index c122a8d..69bdc17 100644
--- 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 0c8e3c1..d409082 100644
--- 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;