Merge branch 'PHP-5.6'

* PHP-5.6:
  add DLL export to the output globals

diff --cc main/output.c
Simple merge

diff --cc main/php_output.h
index b66fe7c0662d8c6142df8d49cd50a231c115cfd9,3831478b9f5e046d06662f59c42fa2c5626e4790..535b09b46cc5602176651fcbff00d386fd3cf5ce
--- 1/main/php_output.h
--- 2/main/php_output.h
+++ b/main/php_output.h
@@@ -148,10 -150,9 +148,10 @@@ ZEND_BEGIN_MODULE_GLOBALS(output
        php_output_handler *running;
        const char *output_start_filename;
        int output_start_lineno;
 +      int flags;
  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