]> granicus.if.org Git - imagemagick/commitdiff
Converting times() to seconds requires sysconf(_SC_CLK_TCK)
authorCristy <urban-warrior@imagemagick.org>
Sat, 16 Jan 2016 21:53:30 +0000 (16:53 -0500)
committerCristy <urban-warrior@imagemagick.org>
Sat, 16 Jan 2016 21:53:30 +0000 (16:53 -0500)
MagickCore/timer.c

index f14f7e97655fa38f49c31d62820fba1b0de01c7d..7ba351f55dd34a26288502403f5f31c1f236ae79 100644 (file)
@@ -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());