Merge branch 'PHP-7.1' into PHP-7.2

marinesovitch · marinesovitch · commit abd97b8bcb14 · 2017-08-08T16:08:19.000+02:00
# Conflicts:
#	ext/json/config.w32
diff --git 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");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ if (PHP_JSON != "no") {`
`19`	`19`
`20`	`20`	`ADD_MAKEFILE_FRAGMENT();`
`21`	`21`
`22`		`- PHP_INSTALL_HEADERS("ext/json/", "php_json.h");`
	`22`	`+ PHP_INSTALL_HEADERS("ext/json/", "php_json.h php_json_parser.h php_json_scanner.h");`
`23`	`23`	`}`
`24`	`24`