com php-src: Merge branch 'PHP-7.1' into PHP-7.2: ext/json/config.w32
| From: | Johannes Schlüter | Date: | Tue, 08 Aug 2017 14:08:19 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1' into PHP-7.2: ext/json/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98968@lists.php.net to get a copy of this message | ||
Commit: abd97b8bcb14b8fa3487348657e23fe79fe483f6
Author: Darek Slusarczyk <dariusz.slusarczyk@oracle.com> Tue, 8 Aug 2017 16:08:19
+0200
Parents: f589e5c791931b258155b5c3f7418e87d129d5d2 86aa1ca9906b5b91d8f63cb0d8facbb4e9019a14
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=abd97b8bcb14b8fa3487348657e23fe79fe483f6
Log:
Merge branch 'PHP-7.1' into PHP-7.2
# Conflicts:
# ext/json/config.w32
Changed paths:
MM ext/json/config.w32
Diff:
diff --cc ext/json/config.w32
index 05f6e65,c1a8ccf..d16e068
--- a/ext/json/config.w32
+++ b/ext/json/config.w32
@@@ -17,8 -17,6 +17,8 @@@ if (PHP_JSON != "no")
ADD_SOURCES(configure_module_dirname, "json_encoder.c json_parser.tab.c
json_scanner.c", "json");
+ 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");
}