Skip to content

V
vlc-2-2
Commit 38227c24 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Remove dirfd() hacks

parent f6287174
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
compat/dirfd.c
View file @ 38227c24
...@@ -25,12 +25,10 @@ ...@@ -25,12 +25,10 @@
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
int dirfd (DIR *dir) int (dirfd) (DIR *dir)
{ {
#if defined (__sun__) || defined (__FreeBSD__) #ifdef dirfd
return dir->dd_fd; return dirfd (dir);
#elif defined (__APPLE__)
return dir->__dd_fd;
#else #else
(void) dir; (void) dir;
# ifdef ENOTSUP # ifdef ENOTSUP
......
include/vlc_fixups.h
View file @ 38227c24
...@@ -183,10 +183,7 @@ int fsync (int fd); ...@@ -183,10 +183,7 @@ int fsync (int fd);
/* dirent.h */ /* dirent.h */
#ifndef HAVE_DIRFD #ifndef HAVE_DIRFD
#if defined(__APPLE__) || defined(__OS2__) || defined(__FreeBSD__) int (dirfd) (DIR *);
#undef dirfd
#endif
int dirfd (DIR *);
#endif #endif
#ifndef HAVE_FDOPENDIR #ifndef HAVE_FDOPENDIR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment