diff options
| author |   millert <millert@openbsd.org> | 2015-03-15 00:41:27 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2015-03-15 00:41:27 +0000 |
| commit | f7055df57d065ba4f741cc0da1e46b156de29446 (patch) | |
| tree | afea67933d21514295f11d6bc76d0204443150d3 /bin/ls/print.c | |
| parent | Eliminate the question 'Which cd?' and just show the available cd's (diff) | |
| download | wireguard-openbsd-f7055df57d065ba4f741cc0da1e46b156de29446.tar.xz wireguard-openbsd-f7055df57d065ba4f741cc0da1e46b156de29446.zip | |
tzfile.h is an internal header that should never have been installed.
What's worse, the tzfile.h that gets installed is over 20 years old
and doesn't match the real tzfile.h in libc/time. This makes the
tree safe for /usr/include/tzfile.h removal. The TM_YEAR_BASE
define has been moved to time.h temporarily until its usage is
replaced by 1900 in the tree. Actual removal of tzfile.h is pending
a ports build. Based on a diff from deraadt@
Diffstat (limited to 'bin/ls/print.c')
| -rw-r--r-- | bin/ls/print.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/ls/print.c b/bin/ls/print.c index ccc1d856ec1..6709c7b27e3 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.33 2015/01/16 06:39:32 deraadt Exp $ */ +/* $OpenBSD: print.c,v 1.34 2015/03/15 00:41:27 millert Exp $ */ /* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */ /* @@ -45,7 +45,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <tzfile.h> #include <unistd.h> #include <limits.h> #include <util.h> @@ -63,7 +62,9 @@ static int compute_columns(DISPLAY *, int *); #define IS_NOPRINT(p) ((p)->fts_number == NO_PRINT) #define DATELEN 64 -#define SIXMONTHS ((DAYSPERNYEAR / 2) * SECSPERDAY) + +#define SECSPERDAY (24 * 60 * 60) +#define SIXMONTHS (SECSPERDAY * 365 / 2) void printscol(DISPLAY *dp) |