mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix [-Werror=missing-braces] compiler warning

Browse Source 
Partial fix to bug 79431
This commit is contained in:
George Peter Banyard 2020-04-12 18:23:54 +02:00
parent 1bba691ecc
commit 446724bcd9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_execute_API.c
View File

@ -46,7 +46,7 @@ ZEND_API void (*zend_execute_ex)(zend_execute_data *execute_data);
ZEND_API void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
/* true globals */
ZEND_API const zend_fcall_info empty_fcall_info = { 0, {{0}, {{0}}, {0}}, NULL, NULL, NULL, 0, 0 };
ZEND_API const zend_fcall_info empty_fcall_info = {0};
ZEND_API const zend_fcall_info_cache empty_fcall_info_cache = { NULL, NULL, NULL, NULL };
#ifdef ZEND_WIN32

2
Zend/zend_types.h
View File

@ -302,6 +302,7 @@ typedef union _zend_value {
struct _zval_struct {
zend_value value; /* value */
union {
uint32_t type_info;
struct {
ZEND_ENDIAN_LOHI_3(
zend_uchar type, /* active type */
@ -310,7 +311,6 @@ struct _zval_struct {
uint16_t extra; /* not further specified */
} u)
} v;
uint32_t type_info;
} u1;
union {
uint32_t next; /* hash collision chain */

2
ext/pdo/pdo_stmt.c
View File

@ -750,7 +750,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, enum pdo_
{
int flags, idx, old_arg_count = 0;
zend_class_entry *ce = NULL, *old_ce = NULL;
zval grp_val, *pgrp, retval, old_ctor_args = {{0}, {{0}}, {0}};
zval grp_val, *pgrp, retval, old_ctor_args = {{0}, {0}, {0}};
int colno;
if (how == PDO_FETCH_USE_DEFAULT) {