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

Merge branch 'PHP-5.6'

Browse source 
* PHP-5.6:
  fix output globals importing
  export output globals
  use portable strndup implementation
  unix sockets aren't available on windows
  dll export APIs needed by phpdbg
  fix sapi/phpdbg/config.w32
  Don't treat warnings as failures in the junit output
This commit is contained in:
Anatol Belski 2014-10-29 20:04:56 +01:00
commit d77ce31763
10 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
main/php_output.h
View file

@ -151,6 +151,12 @@ ZEND_BEGIN_MODULE_GLOBALS(output)
int flags;
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)