diff options
author | Anatol Belski <ab@php.net> | 2015-03-23 21:30:22 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2015-03-23 21:30:22 +0100 |
commit | 663074b6b1fa4534fbbb65462aeef40f2c983ad5 (patch) | |
tree | eea8e6fa4c9aa305c12548dfda6d8f36f5c2957f /ext/tidy | |
parent | 19360f386ec3e78f7f57f9e943569410dc2f718f (diff) | |
download | php-git-663074b6b1fa4534fbbb65462aeef40f2c983ad5.tar.gz |
cleanup mod version macros and mod defs, round x
Diffstat (limited to 'ext/tidy')
-rw-r--r-- | ext/tidy/php_tidy.h | 3 | ||||
-rw-r--r-- | ext/tidy/tidy.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h index 8f4ecf8750..76d42e4566 100644 --- a/ext/tidy/php_tidy.h +++ b/ext/tidy/php_tidy.h @@ -24,6 +24,9 @@ extern zend_module_entry tidy_module_entry; #define phpext_tidy_ptr &tidy_module_entry +#include "php_version.h" +#define PHP_TIDY_VERSION PHP_VERSION + #define TIDY_METHOD_MAP(name, func_name, arg_types) \ ZEND_NAMED_FE(name, ZEND_FN(func_name), arg_types) #define TIDY_NODE_METHOD(name) PHP_FUNCTION(tnm_ ##name) diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 5985957990..f6b987d5b2 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -38,8 +38,6 @@ #define TIDY_CALL #endif -#define PHP_TIDY_MODULE_VERSION "2.0" - /* {{{ ext/tidy macros */ #define FIX_BUFFER(bptr) do { if ((bptr)->size) { (bptr)->bp[(bptr)->size-1] = '\0'; } } while(0) @@ -458,7 +456,7 @@ zend_module_entry tidy_module_entry = { PHP_RINIT(tidy), NULL, PHP_MINFO(tidy), - PHP_TIDY_MODULE_VERSION, + PHP_TIDY_VERSION, PHP_MODULE_GLOBALS(tidy), NULL, NULL, @@ -1077,7 +1075,7 @@ static PHP_MINFO_FUNCTION(tidy) php_info_print_table_start(); php_info_print_table_header(2, "Tidy support", "enabled"); php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate()); - php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id$)"); + php_info_print_table_row(2, "Extension Version", PHP_TIDY_VERSION " ($Id$)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); |