#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)
{
#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
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
# define poll(a, b, c) vlc_poll(a, b, c)
#endif
+#ifndef HAVE_TDESTROY
+# define tdestroy vlc_tdestroy
+#endif
+
#endif /* !LIBVLC_FIXUPS_H */