com php-src: Merge branch 'PHP-7.0' into PHP-7.1: Zend/zend_e xceptions.c Zend/zend_string.c Zend/zend_string.h

Commit: c762c8f3c040a16fef3289a3a51f202dd00912f6 Author: Anatol Belski <ab@php.net> Wed, 12 Oct 2016 22:21:19 +0200 Parents: 8c01eef70fdd52a1e397c1e9ce464e63d90424d5 611ab7fe5b9fe41de56c25b1d348a866794b1fb1 Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c762c8f3c040a16fef3289a3a51f202dd00912f6 Log: Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: export symbol missing by phpdbg Changed paths: MM Zend/zend_exceptions.c MM Zend/zend_string.c MM Zend/zend_string.h Diff: diff --cc Zend/zend_string.h index 8a1ac6f,a1c1beb..1bc3c86 --- a/Zend/zend_string..h +++ b/Zend/zend_string.h @@@ -32,8 -32,9 +32,10 @@@ ZEND_API extern void (*zend_interned_st ZEND_API zend_ulong zend_hash_func(const char *str, size_t len); void zend_interned_strings_init(void); void zend_interned_strings_dtor(void); +void zend_known_interned_strings_init(zend_string ***, uint32_t *); + ZEND_API zend_string *zend_strpprintf(size_t max_len, const char *format, ...); + END_EXTERN_C() /* Shortcuts */