diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-12 12:04:11 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-12 12:04:11 +0200 |
commit | 785f034e4188e60c0a6d2708646438f9872a1309 (patch) | |
tree | ce202d84b957df6723d70e704325f2be073b327a /Zend | |
parent | b8b00263c5d58d2b15d6e59f80cc6b45c3dd3688 (diff) | |
parent | ba40f505e5804a5f62a1e220b0dce9d417a27f4d (diff) | |
download | php-git-785f034e4188e60c0a6d2708646438f9872a1309.tar.gz |
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend')
-rw-r--r-- | Zend/zend.c | 2 | ||||
-rw-r--r-- | Zend/zend.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 3334481961..fceaae62e4 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1097,7 +1097,7 @@ ZEND_COLD void zenderror(const char *error) /* {{{ */ /* }}} */ BEGIN_EXTERN_C() -ZEND_API ZEND_COLD void _zend_bailout(const char *filename, uint32_t lineno) /* {{{ */ +ZEND_API ZEND_COLD ZEND_NORETURN void _zend_bailout(const char *filename, uint32_t lineno) /* {{{ */ { if (!EG(bailout)) { diff --git a/Zend/zend.h b/Zend/zend.h index 600db9204f..a2b76291da 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -232,7 +232,7 @@ void zend_register_standard_ini_entries(void); int zend_post_startup(void); void zend_set_utility_values(zend_utility_values *utility_values); -ZEND_API ZEND_COLD void _zend_bailout(const char *filename, uint32_t lineno); +ZEND_API ZEND_COLD ZEND_NORETURN void _zend_bailout(const char *filename, uint32_t lineno); ZEND_API size_t zend_vspprintf(char **pbuf, size_t max_len, const char *format, va_list ap); ZEND_API size_t zend_spprintf(char **message, size_t max_len, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 3, 4); |