diff options
| author | Remi Collet <remi@php.net> | 2013-09-23 13:23:00 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-09-23 13:23:00 +0200 |
| commit | c760ff1615ba8da301d4ba109bf5fd3193c8b5e2 (patch) | |
| tree | e811b88d0d4dafa7f811182745f1e33b7af6a548 /Zend/zend_exceptions.h | |
| parent | 859b708722aa39e1d2b8495f1eb5cbc4d199faa0 (diff) | |
| parent | f7eff9cd41e0b996af9a0a01d3c5f8fdd8b7fa60 (diff) | |
| download | php-git-c760ff1615ba8da301d4ba109bf5fd3193c8b5e2.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Make message and format arguments const char * to avoid build warning about invalid cast.
Diffstat (limited to 'Zend/zend_exceptions.h')
| -rw-r--r-- | Zend/zend_exceptions.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h index 82633530d6..81c8a1f213 100644 --- a/Zend/zend_exceptions.h +++ b/Zend/zend_exceptions.h @@ -40,12 +40,12 @@ ZEND_API void zend_register_default_classes(TSRMLS_D); /* exception_ce NULL or zend_exception_get_default() or a derived class * message NULL or the message of the exception */ -ZEND_API zval * zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC); -ZEND_API zval * zend_throw_exception_ex(zend_class_entry *exception_ce, long code TSRMLS_DC, char *format, ...); +ZEND_API zval * zend_throw_exception(zend_class_entry *exception_ce, const char *message, long code TSRMLS_DC); +ZEND_API zval * zend_throw_exception_ex(zend_class_entry *exception_ce, long code TSRMLS_DC, const char *format, ...); ZEND_API void zend_throw_exception_object(zval *exception TSRMLS_DC); ZEND_API void zend_clear_exception(TSRMLS_D); -ZEND_API zval * zend_throw_error_exception(zend_class_entry *exception_ce, char *message, long code, int severity TSRMLS_DC); +ZEND_API zval * zend_throw_error_exception(zend_class_entry *exception_ce, const char *message, long code, int severity TSRMLS_DC); extern ZEND_API void (*zend_throw_exception_hook)(zval *ex TSRMLS_DC); @@ -53,7 +53,7 @@ extern ZEND_API void (*zend_throw_exception_hook)(zval *ex TSRMLS_DC); ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC); /* do not export, in php it's available thru spprintf directly */ -int zend_spprintf(char **message, int max_len, char *format, ...); +int zend_spprintf(char **message, int max_len, const char *format, ...); END_EXTERN_C() |