Skip to content

Commit 446724b

Browse files
committed
Fix [-Werror=missing-braces] compiler warning
Partial fix to bug 79431
1 parent 1bba691 commit 446724b

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Zend/zend_execute_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ZEND_API void (*zend_execute_ex)(zend_execute_data *execute_data);
4646
ZEND_API void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
4747

4848
/* true globals */
49-
ZEND_API const zend_fcall_info empty_fcall_info = { 0, {{0}, {{0}}, {0}}, NULL, NULL, NULL, 0, 0 };
49+
ZEND_API const zend_fcall_info empty_fcall_info = {0};
5050
ZEND_API const zend_fcall_info_cache empty_fcall_info_cache = { NULL, NULL, NULL, NULL };
5151

5252
#ifdef ZEND_WIN32

Zend/zend_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ typedef union _zend_value {
302302
struct _zval_struct {
303303
zend_value value; /* value */
304304
union {
305+
uint32_t type_info;
305306
struct {
306307
ZEND_ENDIAN_LOHI_3(
307308
zend_uchar type, /* active type */
@@ -310,7 +311,6 @@ struct _zval_struct {
310311
uint16_t extra; /* not further specified */
311312
} u)
312313
} v;
313-
uint32_t type_info;
314314
} u1;
315315
union {
316316
uint32_t next; /* hash collision chain */

ext/pdo/pdo_stmt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, enum pdo_
750750
{
751751
int flags, idx, old_arg_count = 0;
752752
zend_class_entry *ce = NULL, *old_ce = NULL;
753-
zval grp_val, *pgrp, retval, old_ctor_args = {{0}, {{0}}, {0}};
753+
zval grp_val, *pgrp, retval, old_ctor_args = {{0}, {0}, {0}};
754754
int colno;
755755

756756
if (how == PDO_FETCH_USE_DEFAULT) {

0 commit comments

Comments
 (0)