diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-12 09:29:06 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-12 09:29:06 +0200 |
| commit | 9fa009c86da301ad2a55d0ece09f70df79c022df (patch) | |
| tree | fce42b7eca9776017ee4a639a863ea3578870bc3 /ext | |
| parent | 6df77cafb9a800df7bd4e56e05591de1b67823a3 (diff) | |
| parent | b654a0749233d89704d8b23ae6e758095fdfea1d (diff) | |
| download | php-git-9fa009c86da301ad2a55d0ece09f70df79c022df.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/json/json_parser.y | 2 | ||||
| -rw-r--r-- | ext/standard/config.m4 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y index 1fce1e94fe..242fb83dda 100644 --- a/ext/json/json_parser.y +++ b/ext/json/json_parser.y @@ -46,7 +46,7 @@ int json_yydebug = 1; } -%pure-parser +%define api.pure full %define api.prefix {php_json_yy} %lex-param { php_json_parser *parser } %parse-param { php_json_parser *parser } diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 20ff3d55c0..0a46b1e341 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -406,12 +406,12 @@ AC_CHECK_DECLS([arc4random_buf]) dnl dnl Check for argon2 dnl -PHP_ARG_WITH([argon2], +PHP_ARG_WITH([password-argon2], [whether to build with Argon2 support], - [AS_HELP_STRING([--with-argon2], + [AS_HELP_STRING([--with-password-argon2], [Build with Argon2 support])]) -if test "$PHP_ARGON2" != "no"; then +if test "$PHP_PASSWORD_ARGON2" != "no"; then PKG_CHECK_MODULES([ARGON2], [libargon2]) PHP_EVAL_INCLINE($ARGON2_CFLAGS) |