diff options
Diffstat (limited to '7.patch')
| -rw-r--r-- | 7.patch | 44 |
1 files changed, 0 insertions, 44 deletions
@@ -69,50 +69,6 @@ index 31aad8ff..3042cd56 100644 } while (0); #define DATETIME_FMT_STR "%04u-%02u-%02u %02u:%02u:%02u" ZVAL_NEW_STR(&zv, strpprintf(0, DATETIME_FMT_STR , -diff --git a/mysqlx_class_properties.cc b/mysqlx_class_properties.cc -index 3f1b13b2..a167561a 100644 ---- a/mysqlx_class_properties.cc -+++ b/mysqlx_class_properties.cc -@@ -126,7 +126,11 @@ mysqlx_property_get_value(zval * object, zval * member, int type, void ** cache_ - - - /* {{{ mysqlx_property_set_value */ -+#if PHP_VERSION_ID >= 70400 -+zval * -+#else - void -+#endif - mysqlx_property_set_value(zval * object, zval * member, zval * value, void **cache_slot) - { - zval tmp_member; -@@ -158,7 +162,11 @@ mysqlx_property_set_value(zval * object, zval * member, zval * value, void **cac - if (member == &tmp_member) { - zval_dtor(member); - } -+#if PHP_VERSION_ID >= 70400 -+ DBG_RETURN(value); -+#else - DBG_VOID_RETURN; -+#endif - } - /* }}} */ - -diff --git a/mysqlx_class_properties.h b/mysqlx_class_properties.h -index 878248fa..1e3758ec 100644 ---- a/mysqlx_class_properties.h -+++ b/mysqlx_class_properties.h -@@ -45,7 +45,11 @@ struct st_mysqlx_property - void mysqlx_add_properties(HashTable * ht, const st_mysqlx_property_entry* entries); - - zval * mysqlx_property_get_value(zval * object, zval * member, int type, void ** cache_slot, zval * rv); -+#if PHP_VERSION_ID >= 70400 -+zval *mysqlx_property_set_value(zval * object, zval * member, zval * value, void ** cache_slot); -+#else - void mysqlx_property_set_value(zval * object, zval * member, zval * value, void ** cache_slot); -+#endif - int mysqlx_object_has_property(zval * object, zval *member, int has_set_exists, void ** cache_slot); - - void mysqlx_free_property_cb(zval *el); diff --git a/xmysqlnd/xmysqlnd_protocol_dumper.cc b/xmysqlnd/xmysqlnd_protocol_dumper.cc index aeccf049..63ce118e 100644 --- a/xmysqlnd/xmysqlnd_protocol_dumper.cc |