diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-02 09:42:03 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-02 09:42:03 +0000 |
| commit | f8b291d2885c7b9a92d6a1af9f630ad619e4c875 (patch) | |
| tree | f12fa8ebef15c2aeb9048df2bb55300df6a0a948 /Zend/zend_exceptions.h | |
| parent | 8c5647eef1f456e969cb815bbb1b3e51535804e8 (diff) | |
| parent | f3f594a47d63e993595ad344614cee4a910305b1 (diff) | |
| download | php-git-f8b291d2885c7b9a92d6a1af9f630ad619e4c875.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Switch reflection to use smart_str
Add smart_str_append_printf
Make printf_to_smart_str(ing) the primitive printf operation
Export zend_s(tr)pprintf
Sync smart_string implementation with smart_str
Move smart_string to Zend
Fixed bug #73154
Flush stderr on win32 in cli_log_message
Fixed bug #73154
Diffstat (limited to 'Zend/zend_exceptions.h')
| -rw-r--r-- | Zend/zend_exceptions.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h index e88b5e1db7..61f9500506 100644 --- a/Zend/zend_exceptions.h +++ b/Zend/zend_exceptions.h @@ -68,10 +68,6 @@ extern ZEND_API void (*zend_throw_exception_hook)(zval *ex); /* show an exception using zend_error(severity,...), severity should be E_ERROR */ ZEND_API ZEND_COLD void zend_exception_error(zend_object *exception, int severity); -/* do not export, in php it's available thru spprintf directly */ -size_t zend_spprintf(char **message, size_t max_len, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 3, 4); -zend_string *zend_strpprintf(size_t max_len, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3); - #include "zend_globals.h" static zend_always_inline void zend_rethrow_exception(zend_execute_data *execute_data) |