From dee243d475b088189862d30755aac7bb9cdd61b3 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Mon, 22 Jul 2019 23:25:44 +0200 Subject: [PATCH] Bump PHP_JSON_VERSION to PHP_VERSION Closes GH-4459 --- ext/json/json.c | 1 - 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 -- 2.50.1