Fixed an invalid test when rendering subtitles.

[vlc] / include / vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 25102fa3f6c92dfdf1eda4ebf73d6e703846ab73..ef37367774883357208a618dc9c4a5452c9f36f6 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -197,13 +197,6 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
 }
 #endif
 
-#ifdef WIN32
-# include <dirent.h>
-# define opendir Use_vlc_opendir_or_vlc_wopendir_instead!
-# define readdir Use_vlc_readdir_or_vlc_wreaddir_instead!
-# define closedir vlc_wclosedir
-#endif
-
 /* libintl support */
 #define _(str)            vlc_gettext (str)
 #define N_(str)           gettext_noop (str)
@@ -247,8 +240,32 @@ struct pollfd
 int vlc_poll (struct pollfd *, unsigned, int);
 #endif
 
-#ifndef HAVE_TDESTROY
-# define tdestroy vlc_tdestroy
+#ifndef HAVE_SEARCH_H
+typedef struct entry {
+    char *key;
+    void *data;
+} ENTRY;
+
+typedef enum {
+    FIND, ENTER
+} ACTION;
+
+typedef enum {
+    preorder,
+    postorder,
+    endorder,
+    leaf
+} VISIT;
+
+void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void *) );
+void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) );
+void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) );
+void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) );
+void tdestroy( void *root, void (*free_node)(void *nodep) );
+#else // HAVE_SEARCH_H
+# ifndef HAVE_TDESTROY
+#  define tdestroy vlc_tdestroy
+# endif
 #endif
 
 /* Random numbers */