Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Mon, 26 Mar 2018 11:38:55 +0000 (13:38 +0200)
committerAnatol Belski <ab@php.net>
Mon, 26 Mar 2018 11:38:55 +0000 (13:38 +0200)
* PHP-7.1:
  Fix phpize build when DEFINE() is involved

1  2 
win32/build/confutils.js

Simple merge