diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-06-14 23:35:29 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-06-14 23:35:29 +0200 |
| commit | b1767d8a5625d7347e500e1230cf6c6c66d111ad (patch) | |
| tree | b373131e0e72c8ff65a8dccf5c2eac8c16730dcd /ext | |
| parent | 3d16bb5b62bd3a2a1671be5d2111b23780420cdb (diff) | |
| download | php-git-b1767d8a5625d7347e500e1230cf6c6c66d111ad.tar.gz | |
Bump intl extension version to PHP release version
This patch syncs and simplifies the intl core extension versioning
to match the PHP release version.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/intl/php_intl.c | 4 | ||||
| -rw-r--r-- | ext/intl/php_intl.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 05832eaa34..dc028918b0 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -103,7 +103,6 @@ #include <ext/standard/info.h> #include "php_ini.h" -#define INTL_MODULE_VERSION PHP_INTL_VERSION /* * locale_get_default has a conflict since ICU also has @@ -879,7 +878,7 @@ zend_module_entry intl_module_entry = { PHP_RINIT( intl ), PHP_RSHUTDOWN( intl ), PHP_MINFO( intl ), - INTL_MODULE_VERSION, + PHP_INTL_VERSION, PHP_MODULE_GLOBALS(intl), /* globals descriptor */ PHP_GINIT(intl), /* globals ctor */ NULL, /* globals dtor */ @@ -1061,7 +1060,6 @@ PHP_MINFO_FUNCTION( intl ) php_info_print_table_start(); php_info_print_table_header( 2, "Internationalization support", "enabled" ); - php_info_print_table_row( 2, "version", INTL_MODULE_VERSION ); php_info_print_table_row( 2, "ICU version", U_ICU_VERSION ); #ifdef U_ICU_DATA_VERSION php_info_print_table_row( 2, "ICU Data version", U_ICU_DATA_VERSION ); diff --git a/ext/intl/php_intl.h b/ext/intl/php_intl.h index e672e54087..6d8f46adec 100644 --- a/ext/intl/php_intl.h +++ b/ext/intl/php_intl.h @@ -71,7 +71,7 @@ PHP_MINFO_FUNCTION(intl); const char *intl_locale_get_default( void ); -#define PHP_INTL_VERSION "1.1.0" +#define PHP_INTL_VERSION PHP_VERSION #endif /* PHP_INTL_H */ |