Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
c6d58bc3
Commit
c6d58bc3
authored
Aug 31, 2009
by
Rafaël Carré
Browse files
file access: only use linux/magic.h when it's present
parent
087681d6
Changes
2
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
c6d58bc3
...
...
@@ -863,7 +863,7 @@ AC_CHECK_HEADERS([net/if.h], [], [],
])
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_CHECK_HEADERS(machine/param.h sys/shm.h)
AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h])
AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h
linux/magic.h
])
AC_CHECK_HEADERS(syslog.h)
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
...
...
modules/access/file.c
View file @
c6d58bc3
...
...
@@ -49,7 +49,9 @@
#endif
#if defined (__linux__)
# include <sys/vfs.h>
#ifdef HAVE_LINUX_MAGIC_H
# include <linux/magic.h>
#endif
#elif defined (HAVE_SYS_MOUNT_H)
# include <sys/param.h>
# include <sys/mount.h>
...
...
@@ -143,7 +145,8 @@ static bool IsRemote (int fd)
#if defined(MNT_LOCAL)
return
!
(
stf
.
f_flags
&
MNT_LOCAL
);
#elif defined (__linux__)
#else
# ifdef HAVE_LINUX_MAGIC_H
switch
(
stf
.
f_type
)
{
case
AFS_SUPER_MAGIC
:
...
...
@@ -155,7 +158,7 @@ static bool IsRemote (int fd)
return
true
;
}
return
false
;
# endif
#endif
#else
/* !HAVE_FSTATFS */
(
void
)
fd
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment