lua: rename rc interface to cli

[vlc] / src / input / subtitles.c

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 3881d2f76ddb088ff06c334010da93a89ec3e55a..94231eaed0db0c5d990dd88842111bacb02c5ebb 100644 (file)
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -35,10 +35,6 @@
 #include <vlc_fs.h>
 #include <vlc_url.h>
 
-#ifdef HAVE_DIRENT_H
-#   include <dirent.h>
-#endif
-
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
@@ -61,7 +57,7 @@ static const char const sub_exts[][6] = {
     "idx", "sub",  "srt",
     "ssa", "ass",  "smi",
     "utf", "utf8", "utf-8",
-    "txt", "rt",   "aqt",
+    "rt",   "aqt", "txt",
     "usf", "jss",  "cdg",
     "psb", "mpsub","mpl2",
     "pjs", "dks",
@@ -158,7 +154,7 @@ static int compare_sub_priority( const void *a, const void *b )
     if( p0->priority < p1->priority )
         return 1;
 
-#ifndef UNDER_CE
+#ifdef HAVE_STRCOLL
     return strcoll( p0->psz_fname, p1->psz_fname);
 #else
     return strcmp( p0->psz_fname, p1->psz_fname);