summaryrefslogtreecommitdiff
path: root/archival/libarchive
diff options
context:
space:
mode:
authorJoachim Nilsson2020-05-09 13:31:33 +0200
committerDenys Vlasenko2020-11-16 13:24:24 +0100
commitbd46f64dcb2cf4f37c2cbfeb808f4e380d9d5931 (patch)
tree90f078e89b29cf033c1c58bad0cdeb1393530c05 /archival/libarchive
parent4ac35a30db0c9badd9895c5eaa1d4d3a118b5259 (diff)
downloadbusybox-bd46f64dcb2cf4f37c2cbfeb808f4e380d9d5931.zip
busybox-bd46f64dcb2cf4f37c2cbfeb808f4e380d9d5931.tar.gz
archival: avoid std namespace for local includes
Avoid using same include file naming pattern as available in GLIBC. Renamed to match grp_.h et al. Signed-off-by: Joachim Nilsson <troglobit@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/libarchive')
-rw-r--r--archival/libarchive/get_header_ar.c2
-rw-r--r--archival/libarchive/unpack_ar_archive.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/archival/libarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index b6ecd59..3a19d6f 100644
--- a/archival/libarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -6,7 +6,7 @@
*/
#include "libbb.h"
#include "bb_archive.h"
-#include "ar.h"
+#include "ar_.h"
/* WARNING: Clobbers str[len], so fields must be read in reverse order! */
static unsigned read_num(char *str, int base, int len)
diff --git a/archival/libarchive/unpack_ar_archive.c b/archival/libarchive/unpack_ar_archive.c
index 584c18c..125d424 100644
--- a/archival/libarchive/unpack_ar_archive.c
+++ b/archival/libarchive/unpack_ar_archive.c
@@ -4,7 +4,7 @@
*/
#include "libbb.h"
#include "bb_archive.h"
-#include "ar.h"
+#include "ar_.h"
void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)
{