diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-17 16:29:38 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-17 16:30:46 +0200 |
| commit | 20695fb895a59ee0d3f4de85e648a162dc71744f (patch) | |
| tree | 5b16d4e02fddc84f82ae65d182ca0a3eb454c60c | |
| parent | 310b95d7eb1d10723d6bc4fa4781a7d852100f1d (diff) | |
| parent | 8a9e0312ce90f6cdc55a8fb6f1e1af326306b97a (diff) | |
| download | php-git-20695fb895a59ee0d3f4de85e648a162dc71744f.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #77027: tidy::getOptDoc() not available on Windows
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/tidy/config.w32 | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -44,6 +44,9 @@ PHP NEWS . Fixed bug #76965 (INI_SCANNER_RAW doesn't strip trailing whitespace). (Pierrick) +- Tidy: + . Fixed bug #77027 (tidy::getOptDoc() not available on Windows). (cmb) + - XML: . Fixed bug #30875 (xml_parse_into_struct() does not resolve entities). (cmb) . Add support for getting SKIP_TAGSTART and SKIP_WHITE options. (cmb) diff --git a/ext/tidy/config.w32 b/ext/tidy/config.w32 index 44b2abeacc..aa4eb46539 100644 --- a/ext/tidy/config.w32 +++ b/ext/tidy/config.w32 @@ -17,6 +17,7 @@ if (PHP_TIDY != "no") { EXTENSION("tidy", "tidy.c"); AC_DEFINE('HAVE_TIDY', 1, 'Have TIDY library'); + AC_DEFINE('HAVE_TIDYOPTGETDOC', 1, "tidy_get_opt_doc function") ADD_FLAG('CFLAGS_TIDY', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); if (!PHP_TIDY_SHARED) { ADD_DEF_FILE("ext\\tidy\\php_tidy.def"); |