diff options
author | Joachim Nilsson <troglobit@gmail.com> | 2020-05-09 13:31:33 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-11-16 13:24:24 +0100 |
commit | bd46f64dcb2cf4f37c2cbfeb808f4e380d9d5931 (patch) | |
tree | 90f078e89b29cf033c1c58bad0cdeb1393530c05 /archival/libarchive | |
parent | 4ac35a30db0c9badd9895c5eaa1d4d3a118b5259 (diff) | |
download | busybox-w32-bd46f64dcb2cf4f37c2cbfeb808f4e380d9d5931.tar.gz busybox-w32-bd46f64dcb2cf4f37c2cbfeb808f4e380d9d5931.tar.bz2 busybox-w32-bd46f64dcb2cf4f37c2cbfeb808f4e380d9d5931.zip |
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.c | 2 | ||||
-rw-r--r-- | archival/libarchive/unpack_ar_archive.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/archival/libarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c index b6ecd596c..3a19d6ff7 100644 --- a/archival/libarchive/get_header_ar.c +++ b/archival/libarchive/get_header_ar.c | |||
@@ -6,7 +6,7 @@ | |||
6 | */ | 6 | */ |
7 | #include "libbb.h" | 7 | #include "libbb.h" |
8 | #include "bb_archive.h" | 8 | #include "bb_archive.h" |
9 | #include "ar.h" | 9 | #include "ar_.h" |
10 | 10 | ||
11 | /* WARNING: Clobbers str[len], so fields must be read in reverse order! */ | 11 | /* WARNING: Clobbers str[len], so fields must be read in reverse order! */ |
12 | static unsigned read_num(char *str, int base, int len) | 12 | 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 584c18ce8..125d424c9 100644 --- a/archival/libarchive/unpack_ar_archive.c +++ b/archival/libarchive/unpack_ar_archive.c | |||
@@ -4,7 +4,7 @@ | |||
4 | */ | 4 | */ |
5 | #include "libbb.h" | 5 | #include "libbb.h" |
6 | #include "bb_archive.h" | 6 | #include "bb_archive.h" |
7 | #include "ar.h" | 7 | #include "ar_.h" |
8 | 8 | ||
9 | void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive) | 9 | void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive) |
10 | { | 10 | { |