diff options
| author | Anatol Belski <ab@php.net> | 2014-10-01 22:05:51 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-01 22:05:51 +0200 |
| commit | f5292fbe51faee145a973843d840a611a9da24bc (patch) | |
| tree | b65ab1871eedf23d713290e2dfb5297af7df7eb6 /Zend/zend_exceptions.c | |
| parent | 76081df168829a5cc0409fac47c217d4927ec6f6 (diff) | |
| parent | c4419e7a5bcbe30f568b17164ae30799aaaa5aba (diff) | |
| download | php-git-f5292fbe51faee145a973843d840a611a9da24bc.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Expose zend_throw_exception_internal()
Use inline finction for OBJ_RELEASE() macro
update NEWS about the release date of 5.6.1
only no_NO.ISO-8859-1 have to be ignored
remove bogus locale use from test
use $PHP_LIBDIR instread of "lib" in skel example
Removed zend_execute_data->prev_nested_call. Reuse prev_execute_data instead.
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 999b6d790e..b3770526db 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -85,7 +85,7 @@ void zend_exception_restore(TSRMLS_D) /* {{{ */ } /* }}} */ -void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */ +ZEND_API void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */ { #ifdef HAVE_DTRACE if (DTRACE_EXCEPTION_THROWN_ENABLED()) { |