diff options
| author | Xinchen Hui <laruence@php.net> | 2013-08-15 11:49:59 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-08-15 11:49:59 +0800 |
| commit | cb361ed27ebaf490cac6fb134380daf162a68750 (patch) | |
| tree | 68cc23ccdda0fcbfc4af6e0ed86b6bf0824cc6bb | |
| parent | 8c61758dc772345636e436e3f69bef7323f8b339 (diff) | |
| parent | 8280393828e31913da45ba5ae5efbce34d90f8a8 (diff) | |
| download | php-git-cb361ed27ebaf490cac6fb134380daf162a68750.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -rw-r--r-- | Zend/zend_exceptions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index f07c1135f0..14ae75e38d 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -85,12 +85,12 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */ { #ifdef HAVE_DTRACE if (DTRACE_EXCEPTION_THROWN_ENABLED()) { - char *classname; - int name_len; + const char *classname; + zend_uint name_len; if (exception != NULL) { zend_get_object_classname(exception, &classname, &name_len TSRMLS_CC); - DTRACE_EXCEPTION_THROWN(classname); + DTRACE_EXCEPTION_THROWN((char *)classname); } else { DTRACE_EXCEPTION_THROWN(NULL); } |