libvlc: libvlc_media_get_es->libvlc_media_get_tracks_info.

[vlc] / include / vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index c14152fbca399bef23c53a2f5421a89e7d43ab6a..b05c8097812e900282201e9ff388366794b5e177 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -170,7 +170,8 @@ static inline char *getenv (const char *name)
 #endif
 
 #ifndef HAVE_USELOCALE
-#define LC_NUMERIC_MASK 0
+#define LC_NUMERIC_MASK  0
+#define LC_MESSAGES_MASK 0
 typedef void *locale_t;
 static inline locale_t uselocale(locale_t loc)
 {
@@ -190,8 +191,8 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
 
 #ifdef WIN32
 # include <dirent.h>
-# define opendir Use_utf8_opendir_or_vlc_wopendir_instead!
-# define readdir Use_utf8_readdir_or_vlc_wreaddir_instead!
+# define opendir Use_vlc_opendir_or_vlc_wopendir_instead!
+# define readdir Use_vlc_readdir_or_vlc_wreaddir_instead!
 # define closedir vlc_wclosedir
 #endif
 
@@ -204,11 +205,6 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
 void swab (const void *, void *, ssize_t);
 #endif
 
-#ifndef HAVE_TDESTROY
-typedef void (*__free_fn_t) (void *__nodep);
-void tdestroy (void *vroot, __free_fn_t freefct);
-#endif
-
 /* Socket stuff */
 #ifndef HAVE_INET_PTON
 # define inet_pton vlc_inet_pton
@@ -239,4 +235,8 @@ struct pollfd
 # define poll(a, b, c) vlc_poll(a, b, c)
 #endif
 
+#ifndef HAVE_TDESTROY
+# define tdestroy vlc_tdestroy
+#endif
+
 #endif /* !LIBVLC_FIXUPS_H */