diff options
| author | Anatol Belski <ab@php.net> | 2014-09-23 00:32:48 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-23 00:32:48 +0200 |
| commit | 7099736dfae324660eff5b1fe5d29b55df6a8260 (patch) | |
| tree | 491b5db8a54ba9bf462da084730388145bc985cb /ext/standard/basic_functions.h | |
| parent | 4db75dc8533a69e8849651ab5d0fa84efa3d8bba (diff) | |
| parent | 8be73f2650582423ec1d3c4b65a77c450f6683a0 (diff) | |
| download | php-git-7099736dfae324660eff5b1fe5d29b55df6a8260.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Fix tests/serialize/bug64146.phpt
Remove zend_dynamic_array
Remove static allocator
Fixed typo
Fix list() destructuring to special variables
Remove php_varname_check
Avoid useless reference counting
Specialization (only IS_VAR ad IS_CV operands may be references)
Optimized unset()
Make error paths to be UNEXPECTED
Replace IS_OP?_TMP_FREE() with more clear (OP?_TYPE == IS_TMP_VAR)
Diffstat (limited to 'ext/standard/basic_functions.h')
| -rw-r--r-- | ext/standard/basic_functions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index 9490754b23..a6d8496d75 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/basic_functions.h @@ -204,11 +204,11 @@ typedef struct _php_basic_globals { zend_class_entry *incomplete_class; unsigned serialize_lock; /* whether to use the locally supplied var_hash instead (__sleep/__wakeup) */ struct { - void *var_hash; + struct php_serialize_data *data; unsigned level; } serialize; struct { - void *var_hash; + struct php_unserialize_data *data; unsigned level; } unserialize; |