diff options
| author | Anatol Belski <ab@php.net> | 2018-12-09 19:15:11 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-12-09 19:15:11 +0100 |
| commit | 6734b1106f08f949aee3435fe4d1527393c1d23d (patch) | |
| tree | ee7bb14535fe54055ee5eee9714e22ef6672ee6f | |
| parent | be599873f08033461a9e2381500eaca77a3730e8 (diff) | |
| parent | 81207fc607f9960d72f5345227ac31732fdf86ea (diff) | |
| download | php-git-6734b1106f08f949aee3435fe4d1527393c1d23d.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix syntax error
| -rw-r--r-- | ext/tidy/config.w32 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/tidy/config.w32 b/ext/tidy/config.w32 index f5db084129..d12302ac5e 100644 --- a/ext/tidy/config.w32 +++ b/ext/tidy/config.w32 @@ -4,7 +4,7 @@ ARG_WITH("tidy", "TIDY support", "no"); if (PHP_TIDY != "no") { var tidy_static = false; - if (CHECK_LIB("libtidy_a.lib;tidy_a.lib", "tidy", PHP_TIDY) && (tidy_static = true) || + if ((CHECK_LIB("libtidy_a.lib;tidy_a.lib", "tidy", PHP_TIDY) && (tidy_static = true) || CHECK_LIB("libtidy.lib;tidy.lib", "tidy", PHP_TIDY)) && ( CHECK_HEADER_ADD_INCLUDE("tidy.h", "CFLAGS_TIDY") || |