From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 16 Jan 2016 21:53:30 +0000 (-0500)
Subject: Converting times() to seconds requires sysconf(_SC_CLK_TCK)
X-Git-Tag: 7.0.1-0~322
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93c41c0038797bf5a062241e0946ecb0e4491962;p=imagemagick

Converting times() to seconds requires sysconf(_SC_CLK_TCK)
---

diff --git a/MagickCore/timer.c b/MagickCore/timer.c
index f14f7e976..7ba351f55 100644
--- a/MagickCore/timer.c
+++ b/MagickCore/timer.c
@@ -188,11 +188,11 @@ MagickExport TimerInfo *DestroyTimerInfo(TimerInfo *timer_info)
 */
 static double ElapsedTime(void)
 {
-#if defined(MAGICKCORE_HAVE_TIMES)
+#if defined(MAGICKCORE_HAVE_TIMES) && defined(MAGICKCORE_HAVE_SYSCONF)
   struct tms
     timer;
 
-  return((double) times(&timer)/CLOCKS_PER_SEC);
+  return((double) times(&timer)/sysconf(_SC_CLK_TCK));
 #else
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
   return(NTElapsedTime());
@@ -442,12 +442,12 @@ static void StopTimer(TimerInfo *time_info)
 */
 static double UserTime(void)
 {
-#if defined(MAGICKCORE_HAVE_TIMES)
+#if defined(MAGICKCORE_HAVE_TIMES) && defined(MAGICKCORE_HAVE_SYSCONF)
   struct tms
     timer;
 
   (void) times(&timer);
-  return((double) (timer.tms_utime+timer.tms_stime)/CLOCKS_PER_SEC);
+  return((double) (timer.tms_utime+timer.tms_stime)/sysconf(_SC_CLK_TCK));
 #else
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
   return(NTUserTime());