diff options
| -rw-r--r-- | lib/libc/time/private.h | 31 | ||||
| -rw-r--r-- | usr.sbin/zic/zic.c | 4 |
2 files changed, 2 insertions, 33 deletions
diff --git a/lib/libc/time/private.h b/lib/libc/time/private.h index 411ad303f10..950b6bf0cc1 100644 --- a/lib/libc/time/private.h +++ b/lib/libc/time/private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: private.h,v 1.31 2015/02/09 13:39:16 tedu Exp $ */ +/* $OpenBSD: private.h,v 1.32 2015/02/09 13:42:03 tedu Exp $ */ #ifndef PRIVATE_H #define PRIVATE_H @@ -14,8 +14,6 @@ #define PCTS 1 #define ALL_STATE 1 #define STD_INSPIRED 1 -#define HAVE_STRERROR 1 -#define HAVE_STDINT_H 1 /* ** This header is for use ONLY with the time conversion code. @@ -27,20 +25,6 @@ #define GRANDPARENTED "Local time zone must be set--see zic manual page" -#define HAVE_ADJTIME 1 - -#define HAVE_SETTIMEOFDAY 3 - -#define HAVE_SYMLINK 1 - -#define HAVE_SYS_STAT_H 1 - -#define HAVE_SYS_WAIT_H 1 - -#define HAVE_UNISTD_H 1 - -#define HAVE_UTMPX_H 0 - /* ** Nested includes */ @@ -60,19 +44,6 @@ #include <stdint.h> -#ifndef INT_FAST64_MAX -/* Pre-C99 GCC compilers define __LONG_LONG_MAX__ instead of LLONG_MAX. */ -#if defined LLONG_MAX || defined __LONG_LONG_MAX__ -typedef long long int_fast64_t; -#else /* ! (defined LLONG_MAX || defined __LONG_LONG_MAX__) */ -#if (LONG_MAX >> 31) < 0xffffffff -Please use a compiler that supports a 64-bit integer type (or wider); -you may need to compile with "-DHAVE_STDINT_H". -#endif /* (LONG_MAX >> 31) < 0xffffffff */ -typedef long int_fast64_t; -#endif /* ! (defined LLONG_MAX || defined __LONG_LONG_MAX__) */ -#endif /* !defined INT_FAST64_MAX */ - /* ** Private function declarations. */ diff --git a/usr.sbin/zic/zic.c b/usr.sbin/zic/zic.c index eac0165badd..7fb9d07a62e 100644 --- a/usr.sbin/zic/zic.c +++ b/usr.sbin/zic/zic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zic.c,v 1.5 2015/02/09 13:39:16 tedu Exp $ */ +/* $OpenBSD: zic.c,v 1.6 2015/02/09 13:42:03 tedu Exp $ */ /* ** This file is in the public domain, so clarified as of ** 2006-07-17 by Arthur David Olson. @@ -619,10 +619,8 @@ const char * const tofield; exit(EXIT_FAILURE); result = link(fromname, toname); -#if HAVE_SYMLINK if (result != 0 && errno == EXDEV) result = symlink(fromname, toname); -#endif /* HAVE_SYMLINK */ if (result != 0) { const char *e = strerror(errno); |