diff options
| author | roberto <roberto@FreeBSD.org> | 2008-08-22 15:58:00 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2008-08-22 15:58:00 +0000 |
| commit | b85c7169a740b2edf0106ad59fdaa1b0160f823c (patch) | |
| tree | 2b9fb7f64eacb322e95695e412c923e97ba33e88 /contrib/ntp/libntp/mktime.c | |
| parent | 1d197cfe9feac6bc29537d8e53c30b6435937b95 (diff) | |
| parent | 7a6072eb585696f8856cd498c3fd194cf49f14c6 (diff) | |
| download | FreeBSD-src-b85c7169a740b2edf0106ad59fdaa1b0160f823c.zip FreeBSD-src-b85c7169a740b2edf0106ad59fdaa1b0160f823c.tar.gz | |
Merge ntpd & friends 4.2.4p5 from vendor/ntp/dist into head. Next commit
will update usr.sbin/ntp to match this.
MFC after: 2 weeks
Diffstat (limited to 'contrib/ntp/libntp/mktime.c')
| -rw-r--r-- | contrib/ntp/libntp/mktime.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/contrib/ntp/libntp/mktime.c b/contrib/ntp/libntp/mktime.c index 7f8290f..91be600 100644 --- a/contrib/ntp/libntp/mktime.c +++ b/contrib/ntp/libntp/mktime.c @@ -34,7 +34,6 @@ * SUCH DAMAGE. */ /*static char *sccsid = "from: @(#)ctime.c 5.26 (Berkeley) 2/23/91";*/ -/*static char *rcsid = "mktime.c,v 1.1.1.3 1998/11/15 19:23:34 kardel RELEASE_19990228_A";*/ /* * This implementation of mktime is lifted straight from the NetBSD (BSD 4.4) @@ -62,7 +61,7 @@ #include "ntp_machine.h" -#if !HAVE_MKTIME || !HAVE_TIMEGM +#if !defined(HAVE_MKTIME) || !defined(HAVE_TIMEGM) #ifndef DSTMINUTES #define DSTMINUTES 60 @@ -84,8 +83,6 @@ #define TM_YEAR_BASE 1900 #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) -extern time_t time P((time_t *)); - static int mon_lengths[2][MONSPERYEAR] = { { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } @@ -260,7 +257,7 @@ time2( int mktime_bs; #endif /* !HAVE_MKTIME || !HAVE_TIMEGM */ -#if !HAVE_MKTIME +#ifndef HAVE_MKTIME static time_t time1( struct tm * tmp @@ -287,7 +284,7 @@ mktime( } #endif /* !HAVE_MKTIME */ -#if !HAVE_TIMEGM +#ifndef HAVE_TIMEGM time_t timegm( struct tm * tmp |
