com php-src: Merge branch 'PHP-7.4': ext/date/php_date.c
| From: | Nikita Popov | Date: | Wed, 29 May 2019 07:52:43 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': ext/date/php_date.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106431@lists.php.net to get a copy of this message | ||
Commit: cf610347a7a44b292b59c3b9855e93b3d204d63e
Author: Nikita Popov <nikita.ppv@gmail.com> Wed, 29 May 2019 09:52:43 +0200
Parents: 7c39ff8ef54cd82c2a9a97ff42e452aab6344d36 3bd5b83615d47e480840d50fcaab31a5463cb314
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cf610347a7a44b292b59c3b9855e93b3d204d63e
Log:
Merge branch 'PHP-7.4'
Changed paths:
MM ext/date/php_date.c
Diff:
diff --cc ext/date/php_date.c
index edaab75,94f173b..e995b45
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -657,11 -657,12 +657,12 @@@ static HashTable *date_object_get_debug
static void php_timezone_to_string(php_timezone_obj *tzobj, zval *zv);
static int date_interval_compare_objects(zval *o1, zval *o2);
-static zval *date_interval_read_property(zval *object, zval *member, int type, void **cache_slot,
zval *rv);
-static zval *date_interval_write_property(zval *object, zval *member, zval *value, void
**cache_slot);
-static zval *date_interval_get_property_ptr_ptr(zval *object, zval *member, int type, void
**cache_slot);
-static zval *date_period_read_property(zval *object, zval *member, int type, void **cache_slot,
zval *rv);
-static zval *date_period_write_property(zval *object, zval *member, zval *value, void
**cache_slot);
-static zval *date_period_get_property_ptr_ptr(zval *object, zval *member, int type, void
**cache_slot);
+static zval *date_interval_read_property(zend_object *object, zend_string *member, int type, void
**cache_slot, zval *rv);
+static zval *date_interval_write_property(zend_object *object, zend_string *member, zval *value,
void **cache_slot);
+static zval *date_interval_get_property_ptr_ptr(zend_object *object, zend_string *member, int
type, void **cache_slot);
+static zval *date_period_read_property(zend_object *object, zend_string *member, int type, void
**cache_slot, zval *rv);
+static zval *date_period_write_property(zend_object *object, zend_string *member, zval *value,
void **cache_slot);
++static zval *date_period_get_property_ptr_ptr(zend_object *object, zend_string *member, int type,
void **cache_slot);
/* {{{ Module struct */
zend_module_entry date_module_entry = {
@@@ -5284,3 -5345,11 +5285,11 @@@ static zval *date_period_write_property
return value;
}
/* }}} */
+
+ /* {{{ date_period_get_property_ptr_ptr */
-static zval *date_period_get_property_ptr_ptr(zval *object, zval *member, int type, void
**cache_slot)
++static zval *date_period_get_property_ptr_ptr(zend_object *object, zend_string *member, int type,
void **cache_slot)
+ {
+ /* Fall back to read_property handler. */
+ return NULL;
+ }
+ /* }}} */