From: Anatol Belski <ab@php.net>
Date: Thu, 13 Oct 2016 07:50:32 +0000 (+0200)
Subject: Revert "export symbol missing by phpdbg"
X-Git-Tag: php-7.1.0RC4~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee425297506cb7248085b2bfcddf264af3953d6f;p=php

Revert "export symbol missing by phpdbg"

This reverts commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1.

Overseen strpprintf is there

(cherry picked from commit 3104882cf873308c43dca20bdfd698dd3470a246)
---

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 6e4962dbf2..331213d8e6 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -661,6 +661,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 194170db0b..612c8049ef 100644
--- a/Zend/zend_string.c
+++ b/Zend/zend_string.c
@@ -243,18 +243,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 1bc3c86305..8a1ac6f506 100644
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -34,8 +34,6 @@ 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 */