aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2017-03-20 11:55:03 +0000
committerMartin Matuska <mm@FreeBSD.org>2017-03-20 11:55:03 +0000
commit22d7a1bf74448c50b9a58a81b045a9aa9f7ef6fb (patch)
tree827f18ca585002c4ede2743eb8b8df82260da8b1
parent4a7f6834348e3853977e1b7d69ff44f6eb93313c (diff)
downloadsrc-22d7a1bf74448c50b9a58a81b045a9aa9f7ef6fb.tar.gz
src-22d7a1bf74448c50b9a58a81b045a9aa9f7ef6fb.zip
Update vendor/libarchive to git 3e37a9e051bb7674115ca1e262551a070a92283a
Vendor changes: Fix type in archive_read_open(3) Always use extern keyword for shared constants in archive_acl_maps.h
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=315635
-rw-r--r--libarchive/archive_acl_maps.h2
-rw-r--r--libarchive/archive_acl_maps_darwin.c1
-rw-r--r--libarchive/archive_acl_maps_freebsd.c1
-rw-r--r--libarchive/archive_acl_maps_linux.c1
-rw-r--r--libarchive/archive_acl_maps_sunos.c1
-rw-r--r--libarchive/archive_read_open.32
6 files changed, 1 insertions, 7 deletions
diff --git a/libarchive/archive_acl_maps.h b/libarchive/archive_acl_maps.h
index c9dba525e541..e3f4408286a1 100644
--- a/libarchive/archive_acl_maps.h
+++ b/libarchive/archive_acl_maps.h
@@ -37,7 +37,6 @@ typedef struct {
const int p_perm; /* Platform permission or flag */
} acl_perm_map_t;
-#ifndef _ARCHIVE_ACL_MAPS_DEFS
#if ARCHIVE_ACL_POSIX1E
extern const acl_perm_map_t acl_posix_perm_map[];
extern const int acl_posix_perm_map_size;
@@ -48,5 +47,4 @@ extern const int acl_nfs4_perm_map_size;
extern const acl_perm_map_t acl_nfs4_flag_map[];
extern const int acl_nfs4_flag_map_size;
#endif
-#endif /* !_ARCHIVE_ACL_MAPS_DEFS */
#endif /* ARCHIVE_ACL_MAPS_H_INCLUDED */
diff --git a/libarchive/archive_acl_maps_darwin.c b/libarchive/archive_acl_maps_darwin.c
index eaa046ce471f..af0f4c3eef9f 100644
--- a/libarchive/archive_acl_maps_darwin.c
+++ b/libarchive/archive_acl_maps_darwin.c
@@ -36,7 +36,6 @@
#include "archive_entry.h"
#include "archive_private.h"
#include "archive_read_disk_private.h"
-#define _ARCHIVE_ACL_MAPS_DEFS
#include "archive_acl_maps.h"
const acl_perm_map_t acl_nfs4_perm_map[] = {
diff --git a/libarchive/archive_acl_maps_freebsd.c b/libarchive/archive_acl_maps_freebsd.c
index 222dcff172d9..17b1e953a396 100644
--- a/libarchive/archive_acl_maps_freebsd.c
+++ b/libarchive/archive_acl_maps_freebsd.c
@@ -36,7 +36,6 @@
#include "archive_entry.h"
#include "archive_private.h"
#include "archive_read_disk_private.h"
-#define _ARCHIVE_ACL_MAPS_DEFS
#include "archive_acl_maps.h"
const acl_perm_map_t acl_posix_perm_map[] = {
diff --git a/libarchive/archive_acl_maps_linux.c b/libarchive/archive_acl_maps_linux.c
index 3476e12c19e1..04f630eb8426 100644
--- a/libarchive/archive_acl_maps_linux.c
+++ b/libarchive/archive_acl_maps_linux.c
@@ -39,7 +39,6 @@
#include "archive_entry.h"
#include "archive_private.h"
#include "archive_read_disk_private.h"
-#define _ARCHIVE_ACL_MAPS_DEFS
#include "archive_acl_maps.h"
#if ARCHIVE_ACL_LIBACL
diff --git a/libarchive/archive_acl_maps_sunos.c b/libarchive/archive_acl_maps_sunos.c
index 2197d5011aff..bdc869d175f1 100644
--- a/libarchive/archive_acl_maps_sunos.c
+++ b/libarchive/archive_acl_maps_sunos.c
@@ -36,7 +36,6 @@
#include "archive_entry.h"
#include "archive_private.h"
#include "archive_read_disk_private.h"
-#define _ARCHIVE_ACL_MAPS_DEFS
#include "archive_acl_maps.h"
const acl_perm_map_t acl_posix_perm_map[] = {
diff --git a/libarchive/archive_read_open.3 b/libarchive/archive_read_open.3
index 02494560da4d..2278ebc330c3 100644
--- a/libarchive/archive_read_open.3
+++ b/libarchive/archive_read_open.3
@@ -67,7 +67,7 @@ Streaming Archive Library (libarchive, -larchive)
.Fa "size_t block_size"
.Fc
.Ft int
-.Fn archive_read_open_memory "struct archive *" "void *buff" "size_t size"
+.Fn archive_read_open_memory "struct archive *" "const void *buff" "size_t size"
.Sh DESCRIPTION
.Bl -tag -compact -width indent
.It Fn archive_read_open