From 11b119d526229672b3574036beb07effacfa8815 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 27 Oct 2014 13:08:21 +0100 Subject: fix datatype mismatches --- main/php_output.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main/php_output.h') diff --git a/main/php_output.h b/main/php_output.h index 02b2b85d13..c176063c3b 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -110,7 +110,7 @@ typedef struct _php_output_context { #define PHP_OUTPUT_TSRMLS(ctx) TSRMLS_FETCH_FROM_CTX((ctx)->tsrm_ls) /* old-style, stateless callback */ -typedef void (*php_output_handler_func_t)(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC); +typedef void (*php_output_handler_func_t)(char *output, size_t output_len, char **handled_output, size_t *handled_output_len, int mode TSRMLS_DC); /* new-style, opaque context callback */ typedef int (*php_output_handler_context_func_t)(void **handler_context, php_output_context *output_context); /* output handler context dtor */ @@ -206,8 +206,8 @@ PHPAPI void php_output_set_implicit_flush(int flush TSRMLS_DC); PHPAPI const char *php_output_get_start_filename(TSRMLS_D); PHPAPI int php_output_get_start_lineno(TSRMLS_D); -PHPAPI int php_output_write_unbuffered(const char *str, size_t len TSRMLS_DC); -PHPAPI int php_output_write(const char *str, size_t len TSRMLS_DC); +PHPAPI size_t php_output_write_unbuffered(const char *str, size_t len TSRMLS_DC); +PHPAPI size_t php_output_write(const char *str, size_t len TSRMLS_DC); PHPAPI int php_output_flush(TSRMLS_D); PHPAPI void php_output_flush_all(TSRMLS_D); -- cgit v1.2.1 From 5d76185792d2c7c7d47838b71a0b230f9668e21c Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 29 Oct 2014 20:02:41 +0100 Subject: export output globals needed by phpdbg --- main/php_output.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'main/php_output.h') diff --git a/main/php_output.h b/main/php_output.h index 0312e256f8..947da2c915 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -152,6 +152,12 @@ ZEND_BEGIN_MODULE_GLOBALS(output) int output_start_lineno; ZEND_END_MODULE_GLOBALS(output) +#ifdef ZTS +PHPAPI extern int output_globals_id; +#else +PHPAPI extern php_output_globals output_globals; +#endif + /* there should not be a need to use OG() from outside of output.c */ #ifdef ZTS # define OG(v) TSRMG(output_globals_id, zend_output_globals *, v) -- cgit v1.2.1 From 7b4993dd169a082c2fe79f975224057d1e16c779 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 30 Oct 2014 11:42:02 +0800 Subject: Fixed build.... (shouldn't it be zend_output_globals?) --- main/php_output.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/php_output.h') diff --git a/main/php_output.h b/main/php_output.h index 947da2c915..edea0bff33 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -155,7 +155,7 @@ ZEND_END_MODULE_GLOBALS(output) #ifdef ZTS PHPAPI extern int output_globals_id; #else -PHPAPI extern php_output_globals output_globals; +PHPAPI extern zend_output_globals output_globals; #endif /* there should not be a need to use OG() from outside of output.c */ -- cgit v1.2.1 From 9e1da42af18265d007b5246f01895d3cafc78939 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 30 Oct 2014 11:52:29 +0800 Subject: Use macro --- main/php_output.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'main/php_output.h') diff --git a/main/php_output.h b/main/php_output.h index edea0bff33..6c4b1f7a42 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -152,11 +152,7 @@ ZEND_BEGIN_MODULE_GLOBALS(output) int output_start_lineno; ZEND_END_MODULE_GLOBALS(output) -#ifdef ZTS -PHPAPI extern int output_globals_id; -#else -PHPAPI extern zend_output_globals output_globals; -#endif +ZEND_EXTERN_MODULE_GLOBALS(output); /* there should not be a need to use OG() from outside of output.c */ #ifdef ZTS -- cgit v1.2.1 From 73e2dd338133602825d55b29b8dfb93c3c2c9e2f Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 30 Oct 2014 10:27:20 +0100 Subject: add DLL export to the output globals --- main/php_output.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/php_output.h') diff --git a/main/php_output.h b/main/php_output.h index 6c4b1f7a42..3831478b9f 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -152,7 +152,7 @@ ZEND_BEGIN_MODULE_GLOBALS(output) int output_start_lineno; ZEND_END_MODULE_GLOBALS(output) -ZEND_EXTERN_MODULE_GLOBALS(output); +PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output); /* there should not be a need to use OG() from outside of output.c */ #ifdef ZTS -- cgit v1.2.1