summaryrefslogtreecommitdiff
path: root/time64.c
diff options
context:
space:
mode:
authorCraig A. Berry <craigberry@mac.com>2009-04-25 17:51:38 -0500
committerCraig A. Berry <craigberry@mac.com>2009-04-25 18:11:55 -0500
commitd95a2ea538e6c332f36c34ca45b78d6ad93c3a1f (patch)
tree7af896a0f675ba7495ed49cb5f70ad4a26e60d65 /time64.c
parent4efe685a06ca02d3bdef0d82787eb46835ec9e7e (diff)
downloadperl-d95a2ea538e6c332f36c34ca45b78d6ad93c3a1f.tar.gz
Make time64 use NV for time_t, I32 for year, not Quad_t.
This means it should run on anything that does not have a 64-bit integer type available but does have a double. Presumably this includes platforms that define PERL_MICRO, so we now use the same extended time implementation for everything that runs Perl.
Diffstat (limited to 'time64.c')
-rwxr-xr-xtime64.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/time64.c b/time64.c
index 764ac721b0..ca31acf0ad 100755
--- a/time64.c
+++ b/time64.c
@@ -371,19 +371,19 @@ static struct TM *S_gmtime64_r (const Time64_T *in_time, struct TM *p)
p->tm_zone = "UTC";
#endif
- v_tm_sec = (int)(time % 60);
- time /= 60;
- v_tm_min = (int)(time % 60);
- time /= 60;
- v_tm_hour = (int)(time % 24);
- time /= 24;
- v_tm_tday = time;
+ v_tm_sec = (int)fmod(time, 60.0);
+ time = time >= 0 ? floor(time / 60.0) : ceil(time / 60.0);
+ v_tm_min = (int)fmod(time, 60.0);
+ time = time >= 0 ? floor(time / 60.0) : ceil(time / 60.0);
+ v_tm_hour = (int)fmod(time, 24.0);
+ time = time >= 0 ? floor(time / 24.0) : ceil(time / 24.0);
+ v_tm_tday = (int)time;
WRAP (v_tm_sec, v_tm_min, 60);
WRAP (v_tm_min, v_tm_hour, 60);
WRAP (v_tm_hour, v_tm_tday, 24);
- v_tm_wday = (int)((v_tm_tday + 4) % 7);
+ v_tm_wday = (int)fmod((v_tm_tday + 4.0), 7.0);
if (v_tm_wday < 0)
v_tm_wday += 7;
m = v_tm_tday;
@@ -395,7 +395,7 @@ static struct TM *S_gmtime64_r (const Time64_T *in_time, struct TM *p)
if (m >= 0) {
/* Gregorian cycles, this is huge optimization for distant times */
- cycles = (int)(m / (Time64_T) days_in_gregorian_cycle);
+ cycles = (int)floor(m / (Time64_T) days_in_gregorian_cycle);
if( cycles ) {
m -= (cycles * (Time64_T) days_in_gregorian_cycle);
year += (cycles * years_in_gregorian_cycle);
@@ -419,7 +419,7 @@ static struct TM *S_gmtime64_r (const Time64_T *in_time, struct TM *p)
year--;
/* Gregorian cycles */
- cycles = (int)((m / (Time64_T) days_in_gregorian_cycle) + 1);
+ cycles = (int)ceil((m / (Time64_T) days_in_gregorian_cycle) + 1);
if( cycles ) {
m -= (cycles * (Time64_T) days_in_gregorian_cycle);
year += (cycles * years_in_gregorian_cycle);