Revert "export symbol missing by phpdbg"

This reverts commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1.

Overseen strpprintf is there

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 388c98211583da2d2cab21b41b14d49eaa301ccb..89c94eb56f3e844212169e25547fe9429e16a5ac 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -696,6 +696,18 @@ 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 39912dae303bc7e977be93b1698f49daa357eb00..03d77e1293e6cd1ee1897ee0ee19afcd5e96af2f 100644 (file)
--- a/Zend/zend_string.c
+++ b/Zend/zend_string.c
@@ -198,18 +198,6 @@ 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 a1c1bebaea4ce0d06b5bc764c21969562f60a82e..722fc3ae468d712288e9864f8e65ea6c5ab36a99 100644 (file)
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -33,8 +33,6 @@ 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);
 
-ZEND_API zend_string *zend_strpprintf(size_t max_len, const char *format, ...);
-
 END_EXTERN_C()
 
 /* Shortcuts */