Applied, thank you
On Sat, May 9, 2020 at 1:31 PM Joachim Nilsson <troglo...@gmail.com> wrote: > > Avoid using same include file naming pattern as available in GLIBC. > Renamed to match grp_.h et al. > > Signed-off-by: Joachim Nilsson <troglo...@gmail.com> > --- > archival/ar.c | 2 +- > archival/libarchive/get_header_ar.c | 2 +- > archival/libarchive/unpack_ar_archive.c | 2 +- > include/{ar.h => ar_.h} | 0 > 4 files changed, 3 insertions(+), 3 deletions(-) > rename include/{ar.h => ar_.h} (100%) > > 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 > similarity index 100% > rename from include/ar.h > rename to include/ar_.h > -- > 2.25.1 > > _______________________________________________ > busybox mailing list > busybox@busybox.net > http://lists.busybox.net/mailman/listinfo/busybox _______________________________________________ busybox mailing list busybox@busybox.net http://lists.busybox.net/mailman/listinfo/busybox