Merge branch 'PHP-7.0' into PHP-7.1

marinesovitch · marinesovitch · commit 86aa1ca9906b · 2017-08-08T16:05:13.000+02:00
diff --git a/ext/json/config.w32 b/ext/json/config.w32
@@ -17,6 +17,6 @@ if (PHP_JSON != "no") {
 
 	ADD_SOURCES(configure_module_dirname, "json_encoder.c json_parser.tab.c json_scanner.c", "json");
 
-	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
`@@ -17,6 +17,6 @@ if (PHP_JSON != "no") {`
`17`	`17`
`18`	`18`	`ADD_SOURCES(configure_module_dirname, "json_encoder.c json_parser.tab.c json_scanner.c", "json");`
`19`	`19`
`20`		`- PHP_INSTALL_HEADERS("ext/json/", "php_json.h");`
	`20`	`+ PHP_INSTALL_HEADERS("ext/json/", "php_json.h php_json_parser.h php_json_scanner.h");`
`21`	`21`	`}`
`22`	`22`