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-06-12 09:29:06 +02:00
commit 9fa009c86d
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_ini_parser.y
View file

@ -289,7 +289,7 @@ static void zval_ini_dtor(zval *zv)
%} %}
%expect 0 %expect 0
%pure-parser %define api.pure full
%token TC_SECTION %token TC_SECTION
%token TC_RAW %token TC_RAW

2
Zend/zend_language_parser.y
View file

@ -42,7 +42,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%} %}
%pure-parser %define api.pure full
%expect 0 %expect 0
%code requires { %code requires {

2
ext/json/json_parser.y
View file

@ -46,7 +46,7 @@ int json_yydebug = 1;
} }
%pure-parser %define api.pure full
%define api.prefix {php_json_yy} %define api.prefix {php_json_yy}
%lex-param { php_json_parser *parser } %lex-param { php_json_parser *parser }
%parse-param { php_json_parser *parser } %parse-param { php_json_parser *parser }

6
ext/standard/config.m4
View file

@ -406,12 +406,12 @@ AC_CHECK_DECLS([arc4random_buf])
dnl dnl
dnl Check for argon2 dnl Check for argon2
dnl dnl
PHP_ARG_WITH([argon2], PHP_ARG_WITH([password-argon2],
[whether to build with Argon2 support], [whether to build with Argon2 support],
[AS_HELP_STRING([--with-argon2], [AS_HELP_STRING([--with-password-argon2],
[Build with Argon2 support])]) [Build with Argon2 support])])
if test "$PHP_ARGON2" != "no"; then if test "$PHP_PASSWORD_ARGON2" != "no"; then
PKG_CHECK_MODULES([ARGON2], [libargon2]) PKG_CHECK_MODULES([ARGON2], [libargon2])
PHP_EVAL_INCLINE($ARGON2_CFLAGS) PHP_EVAL_INCLINE($ARGON2_CFLAGS)

2
sapi/phpdbg/phpdbg_parser.y
View file

@ -28,7 +28,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
%} %}
%pure-parser %define api.pure full
%define parse.error verbose %define parse.error verbose
%code requires { %code requires {