Remove an unnecessary include and conditionalize some code.
This commit is contained in:
parent
5ff156d14e
commit
408af9ef60
@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
|
|||||||
|
|
||||||
#include "bsdtar.h"
|
#include "bsdtar.h"
|
||||||
#include "err.h"
|
#include "err.h"
|
||||||
#include "matching.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Per POSIX.1-1988, tar defaults to reading/writing archives to/from
|
* Per POSIX.1-1988, tar defaults to reading/writing archives to/from
|
||||||
@ -180,8 +179,10 @@ main(int argc, char **argv)
|
|||||||
|
|
||||||
time(&now);
|
time(&now);
|
||||||
|
|
||||||
|
#if HAVE_SETLOCALE
|
||||||
if (setlocale(LC_ALL, "") == NULL)
|
if (setlocale(LC_ALL, "") == NULL)
|
||||||
bsdtar_warnc(0, "Failed to set default locale");
|
bsdtar_warnc(0, "Failed to set default locale");
|
||||||
|
#endif
|
||||||
#if defined(HAVE_NL_LANGINFO) && defined(HAVE_D_MD_ORDER)
|
#if defined(HAVE_NL_LANGINFO) && defined(HAVE_D_MD_ORDER)
|
||||||
bsdtar->day_first = (*nl_langinfo(D_MD_ORDER) == 'd');
|
bsdtar->day_first = (*nl_langinfo(D_MD_ORDER) == 'd');
|
||||||
#endif
|
#endif
|
||||||
|
@ -62,6 +62,10 @@
|
|||||||
#include "archive_entry.h"
|
#include "archive_entry.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBACL
|
||||||
|
#include <acl/libacl.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Include "dirent.h" (or it's equivalent on several different platforms).
|
* Include "dirent.h" (or it's equivalent on several different platforms).
|
||||||
*
|
*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user