← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/imagemagick/oneiric-updates

« back to all changes in this revision

Viewing changes to magick/timer.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-06-15 11:05:28 UTC
  • mfrom: (6.2.11 sid)
  • Revision ID: james.westby@ubuntu.com-20110615110528-08jgo07a4846xh8d
Tags: 8:6.6.0.4-3ubuntu1
https://launchpad.net/bugs/797595
* Resynchronise with Debian (LP: #797595).  Remaining changes:
  - Make ufraw-batch (universe) a suggestion instead of a recommendation.
  - Make debian/rules install target depend on check; they cannot reliably
    be run in parallel.
  - Don't set MAKEFLAGS in debian/rules; just pass it to the build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
magick/timer.c
196
196
 
197
197
  return((double) times(&timer)/CLK_TCK);
198
198
#else
199
 
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
 
199
#if defined(__WINDOWS__)
200
200
  return(NTElapsedTime());
201
201
#else
202
202
  return((double) clock()/CLK_TCK);
451
451
  (void) times(&timer);
452
452
  return((double) (timer.tms_utime+timer.tms_stime)/CLK_TCK);
453
453
#else
454
 
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
 
454
#if defined(__WINDOWS__)
455
455
  return(NTUserTime());
456
456
#else
457
457
  return((double) clock()/CLK_TCK);