summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2016-10-14 10:54:09 +0200
committerRemi Collet <remi@php.net>2016-10-14 10:54:09 +0200
commit428ef5083819328b40357e1de229d5cf740a36e7 (patch)
treee00e8fcd78865194473480258b72c810b682bb4e
parentd0b9d72da7348b518b9b2e1887f247123197792c (diff)
parente1f5b6d8dfe1543205d5b45d3dcf1d34f5e2e420 (diff)
downloadphp-git-428ef5083819328b40357e1de229d5cf740a36e7.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: use zend_error instead of zend_error_noreturn
-rw-r--r--ext/bcmath/libbcmath/src/outofmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/bcmath/libbcmath/src/outofmem.c b/ext/bcmath/libbcmath/src/outofmem.c
index 05a85b76ea..7c67509686 100644
--- a/ext/bcmath/libbcmath/src/outofmem.c
+++ b/ext/bcmath/libbcmath/src/outofmem.c
@@ -41,5 +41,5 @@
void bc_out_of_memory (void)
{
- zend_error_noreturn(E_ERROR, "bcmath: out of memory!");
+ zend_error(E_ERROR, "bcmath: out of memory!");
}