aboutsummaryrefslogtreecommitdiff
path: root/libarchive/archive_read_disk_posix.c
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2016-06-29 07:00:15 +0000
committerMartin Matuska <mm@FreeBSD.org>2016-06-29 07:00:15 +0000
commit50fc3a26ef19f9dbc718e1d27615c28c5ad6743d (patch)
tree6357781af7f28c67546766058f0fd22669a35316 /libarchive/archive_read_disk_posix.c
parenta34769f8e41e568b958c47a99a6d363c097f0073 (diff)
downloadsrc-50fc3a26ef19f9dbc718e1d27615c28c5ad6743d.tar.gz
src-50fc3a26ef19f9dbc718e1d27615c28c5ad6743d.zip
Update vendor/libarchive to git 084ef320b8fc62e3fd3acb762fe6175d48d7829c
Vendor issues fixed: #686: Correctly grow buffer in archive_string_append_from_wcs_in_codepage() FreeBSD PR #204157: Fix test on filesystems without birthtime support PR: 204157
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=302264
Diffstat (limited to 'libarchive/archive_read_disk_posix.c')
-rw-r--r--libarchive/archive_read_disk_posix.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index 22a1f14c0e03..f54cda69c125 100644
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -1504,7 +1504,11 @@ setup_current_filesystem(struct archive_read_disk *a)
struct tree *t = a->tree;
struct statfs sfs;
#if defined(HAVE_GETVFSBYNAME) && defined(VFCF_SYNTHETIC)
+# if defined(HAVE_STRUCT_VFSCONF)
+ struct vfsconf vfc;
+# else
struct xvfsconf vfc;
+# endif
#endif
int r, xr = 0;
#if !defined(HAVE_STRUCT_STATFS_F_NAMEMAX)