Remove dirfd() hacks

38227c24 · Rémi Denis-Courmont · f6287174 · 38227c24 · 38227c24
Commit 38227c24 authored Jan 03, 2012 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 9 deletions

compat/dirfd.c compat/dirfd.c +3 -5

include/vlc_fixups.h include/vlc_fixups.h +1 -4

No files found.
--- a/compat/dirfd.c
+++ b/compat/dirfd.c
@@ -25,12 +25,10 @@
 #include <dirent.h>
 #include <errno.h>

-int dirfd (DIR *dir)
+int (dirfd) (DIR *dir)
 {
-#if defined (__sun__) || defined (__FreeBSD__)
-    return dir->dd_fd;
-#elif defined (__APPLE__)
-    return dir->__dd_fd;
+#ifdef dirfd
+    return dirfd (dir);
 #else
    (void) dir;
 # ifdef ENOTSUP

--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -183,10 +183,7 @@ int fsync (int fd);

 /* dirent.h */
 #ifndef HAVE_DIRFD
-#if defined(__APPLE__) || defined(__OS2__) || defined(__FreeBSD__)
-#undef dirfd
-#endif
-int dirfd (DIR *);
+int (dirfd) (DIR *);
 #endif

 #ifndef HAVE_FDOPENDIR