archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

export output globals

Browse source 
needed by phpdbg
This commit is contained in:
Anatol Belski 2014-10-29 20:02:41 +01:00
parent 4b8f411d31
commit 5d76185792
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
main/output.c
View file

@ -35,7 +35,11 @@
#include "zend_stack.h" #include "zend_stack.h"
#include "php_output.h" #include "php_output.h"
ZEND_DECLARE_MODULE_GLOBALS(output); #ifdef ZTS
PHPAPI int output_globals_id;
#else
PHPAPI php_output_globals output_globals;
#endif
const char php_output_default_handler_name[sizeof("default output handler")] = "default output handler"; const char php_output_default_handler_name[sizeof("default output handler")] = "default output handler";
const char php_output_devnull_handler_name[sizeof("null output handler")] = "null output handler"; const char php_output_devnull_handler_name[sizeof("null output handler")] = "null output handler";

6
main/php_output.h
View file

@ -152,6 +152,12 @@ ZEND_BEGIN_MODULE_GLOBALS(output)
int output_start_lineno; int output_start_lineno;
ZEND_END_MODULE_GLOBALS(output) 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 */ /* there should not be a need to use OG() from outside of output.c */
#ifdef ZTS #ifdef ZTS
# define OG(v) TSRMG(output_globals_id, zend_output_globals *, v) # define OG(v) TSRMG(output_globals_id, zend_output_globals *, v)