Commit: 74aea4e471aadeb854bf2a5dbc917f7ea783a281 Author: Anatol Belski <a...@php.net> Wed, 18 Dec 2013 15:18:02 +0100 Parents: 8432557dcda79c298c1fcfd47440940e398afaa4 Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=74aea4e471aadeb854bf2a5dbc917f7ea783a281 Log: fix after merge Changed paths: M Zend/zend.c Diff: diff --git a/Zend/zend.c b/Zend/zend.c index c20e1ba..e16dbce 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -58,7 +58,7 @@ ZEND_API void (*zend_block_interruptions)(void); ZEND_API void (*zend_unblock_interruptions)(void); ZEND_API void (*zend_ticks_function)(int ticks TSRMLS_DC); ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const zend_str_size_uint error_lineno, const char *format, va_list args); -int (*zend_vspprintf)(char **pbuf, zend_str_size_size_t max_len, const char *format, va_list ap); +zend_str_size_int (*zend_vspprintf)(char **pbuf, zend_str_size_size_t max_len, const char *format, va_list ap); ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC); ZEND_API char *(*zend_resolve_path)(const char *filename, zend_str_size_int filename_len TSRMLS_DC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
