← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ext/date/lib/unixtime2tm.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:
ext/date/lib/unixtime2tm.c
16
16
   +----------------------------------------------------------------------+
17
17
 */
18
18
 
19
 
/* $Id: unixtime2tm.c 293036 2010-01-03 09:23:27Z sebastian $ */
 
19
/* $Id: unixtime2tm.c 307131 2011-01-05 15:34:34Z johannes $ */
20
20
 
21
21
#include "timelib.h"
22
22
 
55
55
 
56
56
        if (ts >= 0) {
57
57
                tmp_days = days + 1;
 
58
 
 
59
                if (tmp_days >= DAYS_PER_LYEAR_PERIOD || tmp_days <= -DAYS_PER_LYEAR_PERIOD) {
 
60
                        cur_year += YEARS_PER_LYEAR_PERIOD * (tmp_days / DAYS_PER_LYEAR_PERIOD);
 
61
                        tmp_days -= DAYS_PER_LYEAR_PERIOD * (tmp_days / DAYS_PER_LYEAR_PERIOD);
 
62
                }
 
63
 
58
64
                while (tmp_days >= DAYS_PER_LYEAR) {
59
65
                        cur_year++;
60
66
                        if (timelib_is_leap(cur_year)) {