From: Geoffroy Couprie <geo.couprie@gmail.com>
Date: Mon, 29 Sep 2008 16:52:20 +0000 (+0200)
Subject: WinCE: cleaning my header inclusion mess
X-Git-Tag: 1.0.0-pre1~2806
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e53c94ea141f5e61cb0a0393744e4b3b7991a94d;p=vlc

WinCE: cleaning my header inclusion mess
---

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index c122a8d862..69bdc17882 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 0c8e3c1fea..d409082f7d 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;