Skip to content

Commit ae46e20

Browse files
committed
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Fix #76886: Can't build xmlrpc with expat
2 parents 17c7b71 + 3691b6d commit ae46e20

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ PHP NEWS
77
. Fixed bug #76800 (foreach inconsistent if array modified during loop).
88
(Dmitry)
99

10+
- XMLRPC:
11+
. Fixed bug #76886 (Can't build xmlrpc with expat). (Thomas Petazzoni, cmb)
12+
1013
13 Sep 2018, PHP 7.3.0RC1
1114

1215
- Core:

ext/xml/expat_compat.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ PHP_XML_API const XML_Char *XML_ExpatVersion(void);
152152
PHP_XML_API void XML_ParserFree(XML_Parser);
153153

154154
#elif defined(HAVE_LIBEXPAT)
155+
#include "php.h"
155156
#include <expat.h>
156157
#endif /* HAVE_LIBEXPAT */
157158

0 commit comments

Comments
 (0)