diff options
| author | Anatol Belski <ab@php.net> | 2018-07-09 21:25:19 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-07-09 21:25:19 +0200 |
| commit | 90edf754c5fdd410e22b3052cf2393efac6b1c0c (patch) | |
| tree | 9729aee9c1f629e1de575c291c138c945511fa69 | |
| parent | cce87471b1b5abecf2351dd40962c62374109008 (diff) | |
| parent | 474292c3e4ed3f1c613dad51c13f61fe23eb6501 (diff) | |
| download | php-git-90edf754c5fdd410e22b3052cf2393efac6b1c0c.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Sync callback signature with libxml2 2.9.8
| -rw-r--r-- | ext/dom/dom_iterators.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/dom/dom_iterators.c b/ext/dom/dom_iterators.c index 4930653274..4b94483886 100644 --- a/ext/dom/dom_iterators.c +++ b/ext/dom/dom_iterators.c @@ -42,7 +42,11 @@ struct _notationIterator { xmlNotation *notation; }; -static void itemHashScanner (void *payload, void *data, xmlChar *name) /* {{{ */ +#if LIBXML_VERSION >= 20908 +static void itemHashScanner (void *payload, void *data, const xmlChar *name) /* {{{ */ +#else +static void itemHashScanner (void *payload, void *data, xmlChar *name) +#endif { nodeIterator *priv = (nodeIterator *)data; |