From: Anatol Belski Date: Wed, 12 Oct 2016 20:18:05 +0000 (+0200) Subject: export symbol missing by phpdbg X-Git-Tag: php-7.1.0RC4~39 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e338817d1b459a6e7d3e4ceb88ea25fec6024ea;p=php export symbol missing by phpdbg (cherry picked from commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1) --- diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index bff07cb9f1..f3143b942d 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -661,18 +661,6 @@ size_t zend_spprintf(char **message, size_t max_len, const char *format, ...) /* } /* }}} */ -zend_string *zend_strpprintf(size_t max_len, const char *format, ...) /* {{{ */ -{ - va_list arg; - zend_string *str; - - va_start(arg, format); - str = zend_vstrpprintf(max_len, format, arg); - va_end(arg); - return str; -} -/* }}} */ - /* {{{ proto string Exception|Error::__toString() Obtain the string representation of the Exception object */ ZEND_METHOD(exception, __toString) diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 612c8049ef..194170db0b 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -243,6 +243,18 @@ static void zend_interned_strings_restore_int(void) #endif } +ZEND_API zend_string *zend_strpprintf(size_t max_len, const char *format, ...) /* {{{ */ +{ + va_list arg; + zend_string *str; + + va_start(arg, format); + str = zend_vstrpprintf(max_len, format, arg); + va_end(arg); + return str; +} +/* }}} */ + /* * Local variables: * tab-width: 4 diff --git a/Zend/zend_string.h b/Zend/zend_string.h index 8a1ac6f506..1bc3c86305 100644 --- a/Zend/zend_string.h +++ b/Zend/zend_string.h @@ -34,6 +34,8 @@ 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 */