diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-02-08 14:08:31 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-02-08 14:08:31 +0000 |
| commit | f2825042b4dd9aa941a080c027f15f41c1b9e4bc (patch) | |
| tree | 2e7d97c1dfd4aeabb506ffdd206a612b82adea8d /Zend/zend.h | |
| parent | 0a81f9a0bd36deac8707949acbcf92f612b60e8e (diff) | |
| parent | ce9f52adcdfb19f70dc4274f3587e58ac07995bd (diff) | |
| download | php-git-f2825042b4dd9aa941a080c027f15f41c1b9e4bc.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/json.c
Diffstat (limited to 'Zend/zend.h')
| -rw-r--r-- | Zend/zend.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index f74a84aa71..9d6567530d 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -77,10 +77,10 @@ ZEND_TSRMLS_CACHE_EXTERN; #ifdef HAVE_NORETURN -# if defined(ZEND_WIN32) -ZEND_API ZEND_NORETURN void zend_error_noreturn(int type, const char *format, ...); -# else +# ifdef ZEND_NORETRUN_ALIAS void zend_error_noreturn(int type, const char *format, ...) ZEND_NORETURN; +# else +ZEND_API ZEND_NORETURN void zend_error_noreturn(int type, const char *format, ...); # endif #else # define zend_error_noreturn zend_error |