diff options
-rw-r--r-- | archival/ar.c | 2 | ||||
-rw-r--r-- | archival/libarchive/get_header_ar.c | 2 | ||||
-rw-r--r-- | archival/libarchive/unpack_ar_archive.c | 2 | ||||
-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 @@ | |||
60 | 60 | ||
61 | #include "libbb.h" | 61 | #include "libbb.h" |
62 | #include "bb_archive.h" | 62 | #include "bb_archive.h" |
63 | #include "ar.h" | 63 | #include "ar_.h" |
64 | 64 | ||
65 | #if ENABLE_FEATURE_AR_CREATE | 65 | #if ENABLE_FEATURE_AR_CREATE |
66 | /* filter out entries with same names as specified on the command line */ | 66 | /* 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 @@ | |||
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 | { |
diff --git a/include/ar.h b/include/ar_.h index 386fe0456..386fe0456 100644 --- a/include/ar.h +++ b/include/ar_.h | |||