[Bug 1975] libntp/mktime.c won't work with 64-bit time_t

bk: 4e2e872aMoS1fTK7GOeYuCsCszq0AQ

diff --git a/ChangeLog b/ChangeLog
index a66aec65dec3836463d6b4751f10a530765be7b4..ea64e6ff6d39b430ad79fcea291b7379f161feb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 * [Bug 1961] html2man update: distribute ntp-wait.html.
 * [Bug 1970] UNLINK_EXPR_SLIST() causes crash if list is empty.
 * [Bug 1972] checking for struct rtattr fails.
+* [Bug 1975] libntp/mktime.c won't work with 64-bit time_t
 
 ---
 (4.2.6p4-RC1) 2011/07/10 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/libntp/mktime.c b/libntp/mktime.c
index 381cc4f6dd5e40f09789453d9ca66211c24b1269..f5590d1c0d61b1dee95af77353b66d641f361e45 100644 (file)
--- a/libntp/mktime.c
+++ b/libntp/mktime.c
@@ -63,6 +63,10 @@
 
 #if !defined(HAVE_MKTIME) || !defined(HAVE_TIMEGM)
 
+#if SIZEOF_TIME_T >= 8
+#error libntp supplied mktime()/timegm() do not support 64-bit time_t
+#endif
+
 #ifndef DSTMINUTES
 #define DSTMINUTES 60
 #endif