diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-07-24 22:19:49 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-07-24 22:19:49 +0200 |
| commit | 02cdef555dee090c55076f1419c83707f8928558 (patch) | |
| tree | 5084dc8322cf7fa7f5fb885deb5683bfc4209c6c /ext/json | |
| parent | 9af6d5545ae7d9796bf767b7791760577397f10b (diff) | |
| parent | dee243d475b088189862d30755aac7bb9cdd61b3 (diff) | |
| download | php-git-02cdef555dee090c55076f1419c83707f8928558.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Bump PHP_JSON_VERSION to PHP_VERSION
Diffstat (limited to 'ext/json')
| -rw-r--r-- | ext/json/json.c | 1 | ||||
| -rw-r--r-- | ext/json/php_json.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index b9b506e00b..8474642266 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -186,7 +186,6 @@ static PHP_MINFO_FUNCTION(json) { php_info_print_table_start(); php_info_print_table_row(2, "json support", "enabled"); - php_info_print_table_row(2, "json version", PHP_JSON_VERSION); php_info_print_table_end(); } /* }}} */ diff --git a/ext/json/php_json.h b/ext/json/php_json.h index 50ef76107b..99afe8dd2d 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -20,9 +20,11 @@ #ifndef PHP_JSON_H #define PHP_JSON_H -#define PHP_JSON_VERSION "1.7.0" +#include "php_version.h" #include "zend_smart_str_public.h" +#define PHP_JSON_VERSION PHP_VERSION + extern zend_module_entry json_module_entry; #define phpext_json_ptr &json_module_entry |