Skip to content

PHPC-1982, PHPC-1983: Fix some Windows build warnings #1263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmikola merged 2 commits into from
Oct 5, 2021
Merged

PHPC-1982, PHPC-1983: Fix some Windows build warnings #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a703c30
PHPC-1982: Use bson_gettimeofday for Windows compatibility
jmikola Oct 4, 2021
779e215
PHPC-1983: Fix arg type for ADD_ASSOC_INT64_AS_STRING
jmikola Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions php_phongo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ static void php_phongo_log(mongoc_log_level_t log_level, const char* log_domain,

(void) user_data;

gettimeofday(&tv, NULL);
bson_gettimeofday(&tv);
t = tv.tv_sec;
tu = tv.tv_usec;

Expand Down Expand Up @@ -1326,7 +1326,7 @@ void php_phongo_write_concern_to_zval(zval* retval, const mongoc_write_concern_t
if (wtimeout != 0) {
#if SIZEOF_ZEND_LONG == 4
if (wtimeout > INT32_MAX || wtimeout < INT32_MIN) {
ADD_ASSOC_INT64_AS_STRING(&retval, "wtimeout", wtimeout);
ADD_ASSOC_INT64_AS_STRING(retval, "wtimeout", wtimeout);
} else {
ADD_ASSOC_LONG_EX(retval, "wtimeout", wtimeout);
}
Expand Down
2 changes: 1 addition & 1 deletion src/BSON/UTCDateTime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static bool php_phongo_utcdatetime_init_from_current_time(php_phongo_utcdatetime
int64_t sec, usec;
struct timeval cur_time;

gettimeofday(&cur_time, NULL);
bson_gettimeofday(&cur_time);
sec = cur_time.tv_sec;
usec = cur_time.tv_usec;

Expand Down