From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 1 Nov 2019 16:04:15 +0000 (+0100)
Subject: Fixed bug #78768
X-Git-Tag: php-7.4.7RC1~534
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=944c1cf034541e16ad2c953d7f783e576ed17d63;p=php

Fixed bug #78768

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

diff --git a/NEWS b/NEWS
index a344936ce2..a1f89a732d 100644
--- 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 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;