Merge branch 'PHP-7.4'

author Peter Kokot <peterkokot@gmail.com>

Fri, 1 Mar 2019 18:24:06 +0000 (19:24 +0100)

committer Peter Kokot <peterkokot@gmail.com>

Fri, 1 Mar 2019 18:24:06 +0000 (19:24 +0100)
author Peter Kokot <peterkokot@gmail.com>
Fri, 1 Mar 2019 18:24:06 +0000 (19:24 +0100)
committer Peter Kokot <peterkokot@gmail.com>
Fri, 1 Mar 2019 18:24:06 +0000 (19:24 +0100)
diff --cc configure.ac
Simple merge
diff --cc main/php.h
Simple merge
author	Peter Kokot <peterkokot@gmail.com>
	Fri, 1 Mar 2019 18:24:06 +0000 (19:24 +0100)
committer	Peter Kokot <peterkokot@gmail.com>
	Fri, 1 Mar 2019 18:24:06 +0000 (19:24 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
main/php.h	patch \|	diff1 \|	diff2 \|	blob \| history