diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-29 16:44:54 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-29 16:44:54 +0300 |
| commit | 4bd22cf1c1d6a262fe2f026e082f2565433c53df (patch) | |
| tree | 09a65791a35333a58320a3d872f12496d3a6aecd /ext/spl/spl_array.c | |
| parent | 667e9bd4177e40a52b4f0cd6bfed5737c2694a47 (diff) | |
| download | php-git-4bd22cf1c1d6a262fe2f026e082f2565433c53df.tar.gz | |
Improved zend_string API (Francois Laupretre)
Squashed commit of the following:
commit d96eab8d79b75ac83d49d49ae4665f948d15a804
Author: Francois Laupretre <francois@tekwire.net>
Date: Fri Jun 26 01:23:31 2015 +0200
Use the new 'ZSTR' macros in the rest of the code.
Does not change anything to the generated code (thanks to compat macros) but cleaner.
commit b3526439104ac7a89a8e0c79dbebf33b22bd01b8
Author: Francois Laupretre <francois@tekwire.net>
Date: Thu Jun 25 13:45:06 2015 +0200
Improve zend_string API
Add missing methods
Diffstat (limited to 'ext/spl/spl_array.c')
| -rw-r--r-- | ext/spl/spl_array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 70ae050594..58147f3d39 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -278,7 +278,7 @@ static zval *spl_array_get_dimension_ptr(int check_inherited, zval *object, zval switch (Z_TYPE_P(offset)) { case IS_NULL: - offset_key = STR_EMPTY_ALLOC(); + offset_key = ZSTR_EMPTY_ALLOC(); goto fetch_dim_string; case IS_STRING: offset_key = Z_STR_P(offset); |