Change placholder to placeholder

[vlc] / modules / access / directory.c

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 4e43924013f5ea8408f5e5555783effbb012c10b..eff8d572c118285a5d9ea4c864040742cba9c78e 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -46,13 +46,6 @@
 #   include <io.h>
 #endif
 
-#ifdef __sun__
-static inline int dirfd (DIR *dir)
-{
-    return dir->dd_fd;
-}
-#endif
-
 #include <vlc_fs.h>
 #include <vlc_url.h>
 #include <vlc_strings.h>
@@ -98,7 +91,11 @@ static int visible (const char *name)
 
 static int collate (const char **a, const char **b)
 {
+#ifdef HAVE_STRCOLL
     return strcoll (*a, *b);
+#else
+    return strcmp  (*a, *b);
+#endif
 }
 
 /*****************************************************************************
@@ -225,6 +222,7 @@ void DirClose( vlc_object_t * p_this )
     free (p_sys);
 }
 
+#ifdef HAVE_OPENAT
 /* Detect directories that recurse into themselves. */
 static bool has_inode_loop (const directory_t *dir, dev_t dev, ino_t inode)
 {
@@ -236,6 +234,7 @@ static bool has_inode_loop (const directory_t *dir, dev_t dev, ino_t inode)
     }
     return false;
 }
+#endif
 
 block_t *DirBlock (access_t *p_access)
 {