[vlc-devel] commit: WinCE: header inclusion fixes (Geoffroy Couprie )
git version control
git at videolan.org
Mon Sep 8 19:50:23 CEST 2008
vlc | branch: master | Geoffroy Couprie <geo.couprie at gmail.com> | Thu Sep 4 15:05:18 2008 +0200| [71d9f0d028f4dc9fa4fc1adc56c5bc1c5229c5fd] | committer: Rémi Denis-Courmont
WinCE: header inclusion fixes
Signed-off-by: Rémi Denis-Courmont <rdenis at simphalempin.com>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=71d9f0d028f4dc9fa4fc1adc56c5bc1c5229c5fd
---
include/vlc_common.h | 11 +++++++++++
src/input/subtitles.c | 2 +-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/include/vlc_common.h b/include/vlc_common.h
index bc7290a..f240599 100644
--- 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 0ad27d3..5e46df6 100644
--- 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
More information about the vlc-devel
mailing list