Fixed bug #78768

Remove the typedef from zend_types.h, use explicit struct prefix
instead.

diff --git a/NEWS b/NEWS
index a344936ce216c3084b858dc18cc93583f718550f..a1f89a732d7b5847e631b69fd3ddf478021f533b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 171d70a9dfd5af736d59ca9af9060eba94eea1cb..50634417c60a7a0c2b655420fcc78774d0846426 100644 (file)
--- 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;