aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Nilsson <troglobit@gmail.com>2020-05-09 13:31:33 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2020-11-16 13:24:24 +0100
commitbd46f64dcb2cf4f37c2cbfeb808f4e380d9d5931 (patch)
tree90f078e89b29cf033c1c58bad0cdeb1393530c05
parent4ac35a30db0c9badd9895c5eaa1d4d3a118b5259 (diff)
downloadbusybox-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>
-rw-r--r--archival/ar.c2
-rw-r--r--archival/libarchive/get_header_ar.c2
-rw-r--r--archival/libarchive/unpack_ar_archive.c2
-rw-r--r--include/ar_.h (renamed from include/ar.h)0
4 files changed, 3 insertions, 3 deletions
diff --git a/archival/ar.c b/archival/ar.c
index f4edeb087..2839d85d5 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -60,7 +60,7 @@
#include "libbb.h"
#include "bb_archive.h"
-#include "ar.h"
+#include "ar_.h"
#if ENABLE_FEATURE_AR_CREATE
/* filter out entries with same names as specified on the command line */
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 @@
*/
#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 584c18ce8..125d424c9 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)
{
diff --git a/include/ar.h b/include/ar_.h
index 386fe0456..386fe0456 100644
--- a/include/ar.h
+++ b/include/ar_.h