diff options
| author | Derick Rethans <github@derickrethans.nl> | 2015-04-29 00:27:55 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2015-04-29 00:27:55 +0100 |
| commit | 7d6d8a33695b4cbd35a022f51b017c3cbe6538ed (patch) | |
| tree | ada8219fa4898c08fc3713fcd2c0477fcd440830 | |
| parent | a1fef89abe22f01a23194ac5a58d073dc16f7b6f (diff) | |
| parent | df49ce3d5a0176824330253dff7961a444724767 (diff) | |
| download | php-git-7d6d8a33695b4cbd35a022f51b017c3cbe6538ed.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | ext/date/lib/parse_tz.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c index 8a48fadb63..ecd4899d77 100644 --- a/ext/date/lib/parse_tz.c +++ b/ext/date/lib/parse_tz.c @@ -261,12 +261,12 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz) printf("Geo Location: %f,%f\n", tz->location.latitude, tz->location.longitude); printf("Comments:\n%s\n", tz->location.comments); printf("BC: %s\n", tz->bc ? "" : "yes"); - printf("UTC/Local count: " TIMELIB_ULONG_FMT "\n", (timelib_ulong) tz->bit32.ttisgmtcnt); - printf("Std/Wall count: " TIMELIB_ULONG_FMT "\n", (timelib_ulong) tz->bit32.ttisstdcnt); - printf("Leap.sec. count: " TIMELIB_ULONG_FMT "\n", (timelib_ulong) tz->bit32.leapcnt); - printf("Trans. count: " TIMELIB_ULONG_FMT "\n", (timelib_ulong) tz->bit32.timecnt); - printf("Local types count: " TIMELIB_ULONG_FMT "\n", (timelib_ulong) tz->bit32.typecnt); - printf("Zone Abbr. count: " TIMELIB_ULONG_FMT "\n", (timelib_ulong) tz->bit32.charcnt); + printf("UTC/Local count: %lu\n", (unsigned long) tz->bit32.ttisgmtcnt); + printf("Std/Wall count: %lu\n", (unsigned long) tz->bit32.ttisstdcnt); + printf("Leap.sec. count: %lu\n", (unsigned long) tz->bit32.leapcnt); + printf("Trans. count: %lu\n", (unsigned long) tz->bit32.timecnt); + printf("Local types count: %lu\n", (unsigned long) tz->bit32.typecnt); + printf("Zone Abbr. count: %lu\n", (unsigned long) tz->bit32.charcnt); printf ("%8s (%12s) = %3d [%5ld %1d %3d '%s' (%d,%d)]\n", "", "", 0, |