diff options
Diffstat (limited to 'multimedia/vlc/patches/patch-aa')
| -rw-r--r-- | multimedia/vlc/patches/patch-aa | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/multimedia/vlc/patches/patch-aa b/multimedia/vlc/patches/patch-aa index ebcd89edbab..3fd727d5542 100644 --- a/multimedia/vlc/patches/patch-aa +++ b/multimedia/vlc/patches/patch-aa @@ -1,30 +1,28 @@ -$NetBSD: patch-aa,v 1.13 2010/07/03 14:24:26 wiz Exp $ +$NetBSD: patch-aa,v 1.14 2011/01/24 18:54:04 drochner Exp $ -http://trac.videolan.org/vlc/ticket/3762 - ---- modules/access/file.c.orig 2009-09-18 19:37:45 +0300 -+++ modules/access/file.c 2009-09-26 07:18:35 +0300 -@@ -50,6 +50,9 @@ - #if defined (__linux__) +--- modules/access/file.c.orig 2010-07-19 01:21:06.000000000 +0900 ++++ modules/access/file.c 2011-01-04 22:05:25.000000000 +0900 +@@ -52,6 +52,9 @@ + #ifdef HAVE_LINUX_MAGIC_H # include <sys/vfs.h> # include <linux/magic.h> +#elif defined (HAVE_FSTATVFS) +# include <sys/statvfs.h> +# include <sys/mount.h> - #elif defined (HAVE_SYS_MOUNT_H) - # include <sys/param.h> - # include <sys/mount.h> -@@ -126,7 +129,12 @@ struct access_sys_t + #endif + #if defined( WIN32 ) +@@ -90,7 +93,12 @@ + #ifndef WIN32 static bool IsRemote (int fd) { --#ifdef HAVE_FSTATFS -+#if !defined(__linux__) && defined(HAVE_FSTATVFS) +-#if defined (HAVE_FSTATVFS) && defined (MNT_LOCAL) ++#if !defined(__linux__) && defined(HAVE_FSTATVFS) && defined (MNT_LOCAL) + struct statvfs s; + if (fstatvfs(fd, &s)) + return false; + return !(s.f_flag & MNT_LOCAL); +#elif defined (HAVE_FSTATFS) - struct statfs stf; + struct statvfs stf; - if (fstatfs (fd, &stf)) + if (fstatvfs (fd, &stf)) |