diff options
| author | David Carlier <devnexen@gmail.com> | 2018-01-15 22:07:10 +0000 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-01-25 18:28:55 +0100 |
| commit | e7da9685cf7e0c0a33c5e55b9dddb6cbe8e88d48 (patch) | |
| tree | ed3b47fe97f9713e7308516586ab8b0de9734bb1 /ext/tidy/tidy.c | |
| parent | 93185218e146a23c759d3ce3939e4ac46e82475b (diff) | |
| download | php-git-e7da9685cf7e0c0a33c5e55b9dddb6cbe8e88d48.tar.gz | |
Tidy extension update to be able to either use tidy or tidyp at configure time
Diffstat (limited to 'ext/tidy/tidy.c')
| -rw-r--r-- | ext/tidy/tidy.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 75c7a3f6c1..9cc0699a58 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -30,7 +30,11 @@ #include "php_ini.h" #include "ext/standard/info.h" +#if HAVE_TIDY_H #include "tidy.h" +#elif HAVE_TIDYP_H +#include "tidyp.h" +#endif #if HAVE_TIDYBUFFIO_H #include "tidybuffio.h" @@ -1073,8 +1077,12 @@ static PHP_MINFO_FUNCTION(tidy) php_info_print_table_header(2, "Tidy support", "enabled"); #if HAVE_TIDYBUFFIO_H php_info_print_table_row(2, "libTidy Version", (char *)tidyLibraryVersion()); +#elif HAVE_TIDYP_H + php_info_print_table_row(2, "libTidy Version", (char *)tidyVersion()); #endif +#if HAVE_TIDYRELEASEDATE php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate()); +#endif php_info_print_table_row(2, "Extension Version", PHP_TIDY_VERSION " ($Id$)"); php_info_print_table_end(); @@ -1342,7 +1350,11 @@ static PHP_FUNCTION(tidy_get_release) return; } +#if HAVE_TIDYRELEASEDATE RETURN_STRING((char *)tidyReleaseDate()); +#else + RETURN_STRING((char *)"unknown"); +#endif } /* }}} */ |