Skip to content

Commit 944c1cf

Browse files
committed
Fixed bug #78768
Remove the typedef from zend_types.h, use explicit struct prefix instead.
1 parent a0d58ab commit 944c1cf

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 7.4.0RC6
44

5+
- Core:
6+
. Fixed bug #78768 (redefinition of typedef zend_property_info). (Nikita)
7+
58
- Standard:
69
. Fixed bug #77930 (stream_copy_to_stream should use mmap more often).
710
(Nikita)

Zend/zend_types.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,16 +382,14 @@ struct _zend_resource {
382382
void *ptr;
383383
};
384384

385-
typedef struct _zend_property_info zend_property_info;
386-
387385
typedef struct {
388386
size_t num;
389387
size_t num_allocated;
390-
zend_property_info *ptr[1];
388+
struct _zend_property_info *ptr[1];
391389
} zend_property_info_list;
392390

393391
typedef union {
394-
zend_property_info *ptr;
392+
struct _zend_property_info *ptr;
395393
uintptr_t list;
396394
} zend_property_info_source_list;
397395

0 commit comments

Comments
 (0)