archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source
This commit is contained in:
Nikita Popov 2019-04-11 12:36:10 +02:00
commit 47c74e780d
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/mbstring/mbstring.c
View file

@ -63,7 +63,7 @@
#if ONIGURUMA_VERSION_INT < 60800 #if ONIGURUMA_VERSION_INT < 60800
typedef void OnigMatchParam; typedef void OnigMatchParam;
#define onig_new_match_param() (NULL) #define onig_new_match_param() (NULL)
#define onig_initialize_match_param(x) #define onig_initialize_match_param(x) (void)(x)
#define onig_set_match_stack_limit_size_of_match_param(x, y) #define onig_set_match_stack_limit_size_of_match_param(x, y)
#define onig_free_match_param(x) #define onig_free_match_param(x)
#define onig_search_with_param(reg, str, end, start, range, region, option, mp) \ #define onig_search_with_param(reg, str, end, start, range, region, option, mp) \

2
ext/mbstring/php_mbregex.c
View file

@ -37,7 +37,7 @@
#if ONIGURUMA_VERSION_INT < 60800 #if ONIGURUMA_VERSION_INT < 60800
typedef void OnigMatchParam; typedef void OnigMatchParam;
#define onig_new_match_param() (NULL) #define onig_new_match_param() (NULL)
#define onig_initialize_match_param(x) #define onig_initialize_match_param(x) (void)(x)
#define onig_set_match_stack_limit_size_of_match_param(x, y) #define onig_set_match_stack_limit_size_of_match_param(x, y)
#define onig_free_match_param(x) #define onig_free_match_param(x)
#define onig_search_with_param(reg, str, end, start, range, region, option, mp) \ #define onig_search_with_param(reg, str, end, start, range, region, option, mp) \