diff options
| author | kientzle <kientzle@FreeBSD.org> | 2010-04-11 01:31:50 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2010-04-11 01:31:50 +0000 |
| commit | d4116626da812fc13cf84fb1c23610c98d65b77f (patch) | |
| tree | f5a9b16a0cfdea978f5d654db73cfe73520eae7d | |
| parent | da95b3559b222160ff4018df20e3a873d6975793 (diff) | |
| download | FreeBSD-src-d4116626da812fc13cf84fb1c23610c98d65b77f.zip FreeBSD-src-d4116626da812fc13cf84fb1c23610c98d65b77f.tar.gz | |
Remove an unnecessary include and conditionalize some code.
| -rw-r--r-- | usr.bin/tar/bsdtar.c | 3 | ||||
| -rw-r--r-- | usr.bin/tar/bsdtar_platform.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/tar/bsdtar.c b/usr.bin/tar/bsdtar.c index c858ba3..00c6f45 100644 --- a/usr.bin/tar/bsdtar.c +++ b/usr.bin/tar/bsdtar.c @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$"); #include "bsdtar.h" #include "err.h" -#include "matching.h" /* * Per POSIX.1-1988, tar defaults to reading/writing archives to/from @@ -180,8 +179,10 @@ main(int argc, char **argv) time(&now); +#if HAVE_SETLOCALE if (setlocale(LC_ALL, "") == NULL) bsdtar_warnc(0, "Failed to set default locale"); +#endif #if defined(HAVE_NL_LANGINFO) && defined(HAVE_D_MD_ORDER) bsdtar->day_first = (*nl_langinfo(D_MD_ORDER) == 'd'); #endif diff --git a/usr.bin/tar/bsdtar_platform.h b/usr.bin/tar/bsdtar_platform.h index 5ad8d30..c9b9dd6 100644 --- a/usr.bin/tar/bsdtar_platform.h +++ b/usr.bin/tar/bsdtar_platform.h @@ -62,6 +62,10 @@ #include "archive_entry.h" #endif +#ifdef HAVE_LIBACL +#include <acl/libacl.h> +#endif + /* * Include "dirent.h" (or it's equivalent on several different platforms). * |
