Merge branch 'PHP-7.4'

author Christoph M. Becker <cmbecker69@gmx.de>

Mon, 2 Dec 2019 10:30:23 +0000 (11:30 +0100)

committer Christoph M. Becker <cmbecker69@gmx.de>

Mon, 2 Dec 2019 10:30:23 +0000 (11:30 +0100)
author Christoph M. Becker <cmbecker69@gmx.de>
Mon, 2 Dec 2019 10:30:23 +0000 (11:30 +0100)
committer Christoph M. Becker <cmbecker69@gmx.de>
Mon, 2 Dec 2019 10:30:23 +0000 (11:30 +0100)
diff --cc win32/ioutil.c
Simple merge
diff --cc win32/ioutil.h
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 2 Dec 2019 10:30:23 +0000 (11:30 +0100)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 2 Dec 2019 10:30:23 +0000 (11:30 +0100)
		1	2
win32/ioutil.c	patch \|	diff1 \|	diff2 \|	blob \| history
win32/ioutil.h	patch \|	diff1 \|	diff2 \|	blob \| history