- MFB WS/CS, zend_spprintf() must not be exported

diff --git a/Zend/zend.h b/Zend/zend.h
index 6046f614a25b780fa30c2cb009c92989d994d97f..493ac8b01e56b19f8eaeda8ba318e827b68ce783 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -475,9 +475,9 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
 void zend_shutdown(TSRMLS_D);
 void zend_register_standard_ini_entries(TSRMLS_D);
 
-//#ifdef ZTS
+/*#ifdef ZTS*/
 void zend_post_startup(TSRMLS_D);
-//#endif
+/*#endif*/
 
 void zend_set_utility_values(zend_utility_values *utility_values);
 
@@ -559,7 +559,7 @@ extern ZEND_API void (*zend_ticks_function)(int ticks);
 extern ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
 extern void (*zend_on_timeout)(int seconds TSRMLS_DC);
 extern ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC);
-extern ZEND_API int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap);
+extern int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap);
 extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
 
 

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 8a3c059e3f6a17e0385e1f6d04ea74cd721af2d0..b9c59f2a209e892d7708d8013376321ef231741d 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -551,7 +551,7 @@ ZEND_METHOD(exception, getTraceAsString)
 }
 /* }}} */
 
-int zend_spprintf(char **message, int max_len, char *format, ...)
+static int zend_spprintf(char **message, int max_len, char *format, ...)
 {
        va_list arg;
        int len;