From ff717da2cf625e3d07537a93a4c240692fa55bd6 Mon Sep 17 00:00:00 2001
From: Ollivier Robert <roberto@FreeBSD.org>
Date: Mon, 18 Aug 2008 14:26:05 +0000
Subject: Import ntp 4.2.4p5 in the vendor code area.  Far too many changes to
 list here, please see CommitLog for detailed changes.

XXX html/build/hints/solaris.xtra.4095849 is not being imported as it conflicts
    with the detect-merge-conflict.sh script in our repo.
---
 libntp/mktime.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'libntp/mktime.c')

diff --git a/libntp/mktime.c b/libntp/mktime.c
index 7f8290f3c3ed9..91be60015b007 100644
--- a/libntp/mktime.c
+++ b/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
-- 
cgit v1.2.3