diff options
| author | Darek Slusarczyk <dariusz.slusarczyk@oracle.com> | 2017-08-08 16:08:19 +0200 |
|---|---|---|
| committer | Darek Slusarczyk <dariusz.slusarczyk@oracle.com> | 2017-08-08 16:08:19 +0200 |
| commit | abd97b8bcb14b8fa3487348657e23fe79fe483f6 (patch) | |
| tree | 23bd5f6a727b36765fbd8c963ae1053d60cb41bd /ext/json | |
| parent | f589e5c791931b258155b5c3f7418e87d129d5d2 (diff) | |
| parent | 86aa1ca9906b5b91d8f63cb0d8facbb4e9019a14 (diff) | |
| download | php-git-abd97b8bcb14b8fa3487348657e23fe79fe483f6.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
# Conflicts:
# ext/json/config.w32
Diffstat (limited to 'ext/json')
| -rw-r--r-- | ext/json/config.w32 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/config.w32 b/ext/json/config.w32 index 05f6e659e4..d16e0686d3 100644 --- a/ext/json/config.w32 +++ b/ext/json/config.w32 @@ -19,6 +19,6 @@ if (PHP_JSON != "no") { ADD_MAKEFILE_FRAGMENT(); - PHP_INSTALL_HEADERS("ext/json/", "php_json.h"); + PHP_INSTALL_HEADERS("ext/json/", "php_json.h php_json_parser.h php_json_scanner.h"); } |