summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 f4edeb0..2839d85 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 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)
{
diff --git a/include/ar.h b/include/ar_.h
index 386fe04..386fe04 100644
--- a/include/ar.h
+++ b/include/ar_.h