Skip to content

Commit cbb5f9f

Browse files
committed
Merge remote-tracking branch 'derickr/PHPC-997-take3' into v1.2
2 parents 5380723 + d5aef90 commit cbb5f9f

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/BSON/UTCDateTime.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,11 @@ static bool php_phongo_utcdatetime_init_from_date(php_phongo_utcdatetime_t *inte
142142

143143
/* The following assignments use the same logic as date_format() in php_date.c */
144144
sec = datetime_obj->time->sse;
145+
#if PHP_VERSION_ID >= 70200
146+
usec = (int64_t) floor(datetime_obj->time->us);
147+
#else
145148
usec = (int64_t) floor(datetime_obj->time->f * 1000000 + 0.5);
149+
#endif
146150

147151
intern->milliseconds = (sec * 1000) + (usec / 1000);
148152
intern->initialized = true;
@@ -273,7 +277,11 @@ PHP_METHOD(UTCDateTime, toDateTime)
273277
php_date_initialize(datetime_obj, sec, sec_len, NULL, NULL, 0 TSRMLS_CC);
274278
efree(sec);
275279

280+
#if PHP_VERSION_ID >= 70200
281+
datetime_obj->time->us = (intern->milliseconds % 1000) * 1000;
282+
#else
276283
datetime_obj->time->f = (double) (intern->milliseconds % 1000) / 1000;
284+
#endif
277285
}
278286
/* }}} */
279287

0 commit comments

Comments
 (0)