summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-04-05 22:50:00 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2018-09-15 13:21:53 +0200
commit3691b6d245db6f69b5844ed86fa623d587d8d626 (patch)
treeb0767a98a69126da924d647d85692ffa655b0ab6
parent3bc4a63fc27768c665fcbc101db4e579c761833b (diff)
downloadphp-git-3691b6d245db6f69b5844ed86fa623d587d8d626.tar.gz
Fix #76886: Can't build xmlrpc with expat
We fix it by including "php.h" in the HAVE_LIBEXPAT case.
-rw-r--r--NEWS3
-rw-r--r--ext/xml/expat_compat.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 952182f2cf..fa5b68f596 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,9 @@ PHP NEWS
. Fixed bug #74764 (Bindto IPv6 works with file_get_contents but fails with
stream_socket_client). (Ville Hukkamäki)
+- XMLRPC:
+ . Fixed bug #76886 (Can't build xmlrpc with expat). (Thomas Petazzoni, cmb)
+
- Zlib:
. Fixed bug #75273 (php_zlib_inflate_filter() may not update bytes_consumed).
(Martin Burke, cmb)
diff --git a/ext/xml/expat_compat.h b/ext/xml/expat_compat.h
index ed621ab53d..29fe48a7dd 100644
--- a/ext/xml/expat_compat.h
+++ b/ext/xml/expat_compat.h
@@ -154,6 +154,7 @@ PHP_XML_API const XML_Char *XML_ExpatVersion(void);
PHP_XML_API void XML_ParserFree(XML_Parser);
#elif defined(HAVE_LIBEXPAT)
+#include "php.h"
#include <expat.h>
#endif /* HAVE_LIBEXPAT */