Skip to content

[pull] master from php:master #581

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
merged 2 commits into from
Jan 31, 2025
Merged

[pull] master from php:master #581

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
ed320b5
Fix C23 syntax for VS16 (CI runs VS22)
KalleZ Jan 31, 2025
8deca28
Fix initializer for older C compilers
ndossche Jan 31, 2025
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
14 changes: 5 additions & 9 deletions ext/pdo/pdo_stmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,15 +638,11 @@ static bool pdo_do_key_pair_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation o
static bool pdo_call_fetch_object_constructor(zend_function *constructor, HashTable *ctor_args, zval *return_value)
{
zval retval_constructor_call;
zend_fcall_info fci = {
.size = sizeof(zend_fcall_info),
.function_name = {},
.object = Z_OBJ_P(return_value),
.retval = &retval_constructor_call,
.param_count = 0,
.params = NULL,
.named_params = ctor_args,
};
zend_fcall_info fci = { 0 };
fci.size = sizeof(zend_fcall_info);
fci.object = Z_OBJ_P(return_value);
fci.retval = &retval_constructor_call;
fci.named_params = ctor_args;
zend_fcall_info_cache fcc = {
.function_handler = constructor,
.object = Z_OBJ_P(return_value),
Expand Down
2 changes: 1 addition & 1 deletion ext/spl/spl_iterators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3086,7 +3086,7 @@ PHP_FUNCTION(iterator_apply)
spl_iterator_apply_info apply_info = {
.count = 0,
.params_ht = NULL,
.fcc = {},
.fcc = { 0 },
};

/* The HashTable is used to determine positional arguments */
Expand Down