Fix -Wmissing-braces warnings

Unfortunate that = {} is a GNU extension.

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 85c0bf8cd5a473c7f54f76a2790d8fda89d0f83d..0837c5b0b83ece040fc11381ec16c67d8d6f02ea 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5872,7 +5872,8 @@ void zend_compile_func_decl(znode *result, zend_ast *ast, zend_bool toplevel) /*
        zend_op_array *orig_op_array = CG(active_op_array);
        zend_op_array *op_array = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));
        zend_oparray_context orig_oparray_context;
-       closure_info info = {0};
+       closure_info info;
+       memset(&info, 0, sizeof(closure_info));
 
        init_op_array(op_array, ZEND_USER_FUNCTION, INITIAL_OP_ARRAY_SIZE);
 

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index bd93ca3cb2657ee467ce848b52f8da06c2eb6f9e..1fc114ccf9f8e9abea66052d8f774fb9c6768c46 100644 (file)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -821,7 +821,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};
+       zval grp_val, *pgrp, retval, old_ctor_args = {{0}};
        int colno;
 
        if (how == PDO_FETCH_USE_DEFAULT) {

diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c
index af7165e8e073f0f25a45818613aa3211e03539de..2ede92bc6e8c2a47a14ed5a7493644bdbed148e9 100644 (file)
--- a/ext/sockets/multicast.c
+++ b/ext/sockets/multicast.c
@@ -463,7 +463,7 @@ static int _php_mcast_join_leave(
                        sizeof(greq));
 #else
        if (sock->type == AF_INET) {
-               struct ip_mreq mreq = {0};
+               struct ip_mreq mreq = {{0}};
                struct in_addr addr;
 
                assert(group_len == sizeof(struct sockaddr_in));
@@ -483,7 +483,7 @@ static int _php_mcast_join_leave(
        }
 #if HAVE_IPV6
        else if (sock->type == AF_INET6) {
-               struct ipv6_mreq mreq = {0};
+               struct ipv6_mreq mreq = {{0}};
 
                assert(group_len == sizeof(struct sockaddr_in6));