[Bug 2519] mktime.c does not compile on 64-bit Solaris but we do not need timegm...

bk: 52bfd570JhhaXr8U2XlQs8Pzgd3C9Q

diff --git a/ChangeLog b/ChangeLog
index ceec96b6b8217dbdb8fae66ab2d04cd9e1949bc2..4c27e99125b3bc91b8bd29bc9d6bb84a285d6a0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [Bug 2519] mktime.c does not compile on 64-bit Solaris but we do not
+  need timegm() and the Solaris provides mktime().
 * [Bug 2522] Revert Bug 2513 fix - it breaks backward compatibility.
 (4.2.7p406) 2013/12/28 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2521] VPATH tweaks for perl -opts files.

diff --git a/libntp/mktime.c b/libntp/mktime.c
index 08dbd41719b0d35e3d1f1c8bbd6914abf4328c63..50d2a081040832cd456b69db1d09546085f79cde 100644 (file)
--- a/libntp/mktime.c
+++ b/libntp/mktime.c
@@ -62,7 +62,7 @@
 #include <config.h>
 #include "ntp_machine.h"
 
-#if !defined(HAVE_MKTIME) || !defined(HAVE_TIMEGM)
+#if !defined(HAVE_MKTIME) || ( !defined(HAVE_TIMEGM) && defined(WANT_TIMEGM) )
 
 #if SIZEOF_TIME_T >= 8
 #error libntp supplied mktime()/timegm() do not support 64-bit time_t
@@ -289,6 +289,7 @@ mktime(
 }
 #endif /* !HAVE_MKTIME */
 
+#ifdef WANT_TIMEGM
 #ifndef HAVE_TIMEGM
 time_t
 timegm(
@@ -306,3 +307,4 @@ timegm(
        return WRONG;
 }
 #endif /* !HAVE_TIMEGM */
+#endif /* WANT_TIMEGM */