← Back to branch summary

~clint-fewbar/ubuntu/precise/php5/php5-5.4-merge

« back to all changes in this revision

Viewing changes to win32/time.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-02-22 09:46:37 UTC
  • mfrom: (1.1.20) (0.3.18 sid)
  • Revision ID: package-import@ubuntu.com-20110222094637-nlu2tvb7oqgaarl0
Tags: 5.3.5-1ubuntu1
* Merge from debian/unstable. Remaining changes:
 - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions 
      already in universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, sybase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
    * stop mysql instance on clean just in case we failed in tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
win32/time.c
11
11
 *
12
12
 *****************************************************************************/
13
13
 
14
 
/* $Id: time.c 273823 2009-01-19 02:35:22Z pajoye $ */
 
14
/* $Id: time.c 305298 2010-11-12 18:37:02Z cataphract $ */
15
15
 
16
16
 /**
17
17
  *
105
105
                    dt = (double)timer/PW32G(freq);
106
106
                    time_Info->tv_sec = PW32G(starttime).tv_sec + (int)dt;
107
107
                    time_Info->tv_usec = PW32G(starttime).tv_usec + (int)((dt-(int)dt)*1000000);
108
 
                    if (time_Info->tv_usec > 1000000) {
 
108
                    if (time_Info->tv_usec >= 1000000) {
109
109
                        time_Info->tv_usec -= 1000000;
110
110
                        ++time_Info->tv_sec;
111
111
                    }