diff options
| author | Nikita Popov <nikic@php.net> | 2016-04-21 23:35:51 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-04-21 23:35:51 +0200 |
| commit | 89fbce5c5ff4990a1ec2fb8fde06f802a707aa5f (patch) | |
| tree | c334eed2971791c2a3ee8c02a938e0b2aaa6c221 | |
| parent | a5944f8dd5c45a95bb0cfdea52dd2301fab1f39c (diff) | |
| download | php-git-89fbce5c5ff4990a1ec2fb8fde06f802a707aa5f.tar.gz | |
Mark zend_timeout as noreturn
Otherwise we get a compiler warning...
| -rw-r--r-- | Zend/zend_execute.h | 2 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index b2163c7d25..05f0e9a956 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -288,7 +288,7 @@ ZEND_API zend_bool zend_is_executing(void); ZEND_API void zend_set_timeout(zend_long seconds, int reset_signals); ZEND_API void zend_unset_timeout(void); -ZEND_API void zend_timeout(int dummy); +ZEND_API ZEND_NORETURN void zend_timeout(int dummy); ZEND_API zend_class_entry *zend_fetch_class(zend_string *class_name, int fetch_type); ZEND_API zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, const zval *key, int fetch_type); void zend_verify_abstract_class(zend_class_entry *ce); diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 99cc601950..f1abd801d1 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1186,7 +1186,7 @@ ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, static void zend_set_timeout_ex(zend_long seconds, int reset_signals); -ZEND_API void zend_timeout(int dummy) /* {{{ */ +ZEND_API ZEND_NORETURN void zend_timeout(int dummy) /* {{{ */ { EG(timed_out) = 0; zend_set_timeout_ex(0, 1); |