WinCE: header inclusion fixes

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

diff --git a/include/vlc_common.h b/include/vlc_common.h
index bc7290ad7190bbc157a97debf890a5439d83bd9e..f2405990673f99f080cd09a6b052708071ebfc30 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -383,10 +383,18 @@ 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
 /* You should otherwise use utf8_stat and utf8_lstat. */
 #else
 struct stat;
@@ -485,6 +493,9 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 # define LIBVLC_EXTERN extern
 #endif
 #if defined (WIN32) && defined (DLL_EXPORT)
+#if defined (UNDER_CE)
+# include <windef.h>
+#endif
 # define LIBVLC_EXPORT __declspec(dllexport)
 #else
 # define LIBVLC_EXPORT

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 0ad27d3b82238d4d81fc79b9f759d1ed1c0790f6..5e46df6ca9c46e15f17f94589ece728c5521a609 100644 (file)
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -278,7 +278,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
     }
     else
     {
-#ifdef HAVE_UNISTD_H
+#if defined (HAVE_UNISTD_H) && !defined (UNDER_CE)
         /* Get the current working directory */
         char *psz_cwd = getcwd( NULL, 0 );
 #else