Commit 22220ec5 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove dirfd() hacks

(cherry picked from commit 38227c2441ad80bbf000f3a5fda40f5ca1dd6e3d)

Conflicts:

	compat/dirfd.c
	include/vlc_fixups.h
Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 87b5f8f6
......@@ -25,12 +25,10 @@
#include <dirent.h>
#include <errno.h>
int dirfd (DIR *dir)
int (dirfd) (DIR *dir)
{
#if defined (__sun__)
return dir->dd_fd;
#elif defined (__APPLE__)
return dir->__dd_fd;
#ifdef dirfd
return dirfd (dir);
#else
(void) dir;
# ifdef ENOTSUP
......
......@@ -183,10 +183,7 @@ int fsync (int fd);
/* dirent.h */
#ifndef HAVE_DIRFD
#if defined(__APPLE__) || defined(__OS2__)
#undef dirfd
#endif
int dirfd (DIR *);
int (dirfd) (DIR *);
#endif
#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