Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  export symbol missing by phpdbg

3 files changed, 14 insertions, 12 deletions

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 */