diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-11-01 17:04:15 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-11-01 17:04:15 +0100 |
commit | 944c1cf034541e16ad2c953d7f783e576ed17d63 (patch) | |
tree | b9d8d7ce7fe5543303f92f7e242517bf49b64dc1 | |
parent | a0d58abb79b5f2c91e30a5ae6a0e835ed3ed3026 (diff) | |
download | php-git-944c1cf034541e16ad2c953d7f783e576ed17d63.tar.gz |
Fixed bug #78768
Remove the typedef from zend_types.h, use explicit struct prefix
instead.
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | Zend/zend_types.h | 6 |
2 files changed, 5 insertions, 4 deletions
@@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.4.0RC6 +- Core: + . Fixed bug #78768 (redefinition of typedef zend_property_info). (Nikita) + - Standard: . Fixed bug #77930 (stream_copy_to_stream should use mmap more often). (Nikita) diff --git a/Zend/zend_types.h b/Zend/zend_types.h index 171d70a9df..50634417c6 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -382,16 +382,14 @@ struct _zend_resource { void *ptr; }; -typedef struct _zend_property_info zend_property_info; - typedef struct { size_t num; size_t num_allocated; - zend_property_info *ptr[1]; + struct _zend_property_info *ptr[1]; } zend_property_info_list; typedef union { - zend_property_info *ptr; + struct _zend_property_info *ptr; uintptr_t list; } zend_property_info_source_list; |