From: Darek Slusarczyk <dariusz.slusarczyk@oracle.com>
Date: Tue, 8 Aug 2017 14:08:19 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0beta3~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abd97b8bcb14b8fa3487348657e23fe79fe483f6;p=php

Merge branch 'PHP-7.1' into PHP-7.2

# Conflicts:
#	ext/json/config.w32
---

abd97b8bcb14b8fa3487348657e23fe79fe483f6
diff --cc ext/json/config.w32
index 05f6e659e4,c1a8ccfb30..d16e0686d3
--- 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");
  }