Merge branch 'master' of git@git.videolan.org:vlc

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index a3ef427671ee4bd74608fe33c7f064764a193acf..9194932afd29fd18bffe2225db37a7e3ec523a9c 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -111,6 +111,8 @@ void msg_StackDestroy (void *);
 /*
  * Unicode stuff
  */
+char *vlc_fix_readdir (const char *);
+bool vlc_current_charset (char **);
 
 /*
  * LibVLC objects stuff
@@ -145,7 +147,7 @@ typedef struct libvlc_global_data_t
 {
     VLC_COMMON_MEMBERS
 
-   /* Object structure data */
+    /* Object structure data */
     int                    i_counter;   ///< object counter
     int                    i_objects;   ///< Attached objects count
     vlc_object_t **        pp_objects;  ///< Array of all objects
@@ -250,4 +252,41 @@ extern const size_t libvlc_config_count;
  */
 void var_OptionParse (vlc_object_t *, const char *, bool trusted);
 
+/*
+ * Replacement functions
+ */
+# ifndef HAVE_DIRENT_H
+typedef void DIR;
+#  ifndef FILENAME_MAX
+#      define FILENAME_MAX (260)
+#  endif
+struct dirent
+{
+    long            d_ino;          /* Always zero. */
+    unsigned short  d_reclen;       /* Always zero. */
+    unsigned short  d_namlen;       /* Length of name in d_name. */
+    char            d_name[FILENAME_MAX]; /* File name. */
+};
+#  define opendir vlc_opendir
+#  define readdir vlc_readdir
+#  define closedir vlc_closedir
+#  define rewinddir vlc_rewindir
+void *vlc_opendir (const char *);
+void *vlc_readdir (void *);
+int   vlc_closedir(void *);
+void  vlc_rewinddir(void *);
+# endif
+
+#if defined (WIN32)
+#   include <dirent.h>
+void *vlc_wopendir (const wchar_t *);
+/* void *vlc_wclosedir (void *); in vlc's exported symbols */
+struct _wdirent *vlc_wreaddir (void *);
+void vlc_rewinddir (void *);
+#   define _wopendir vlc_wopendir
+#   define _wreaddir vlc_wreaddir
+#   define _wclosedir vlc_wclosedir
+#   define rewinddir vlc_rewinddir
+#endif
+
 #endif