From: Anatol Belski <ab@php.net>
Date: Thu, 30 Oct 2014 09:28:05 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_REMOVALS~87^2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6874a9b419db82dcfefa0a260fb289577b414b6;p=php

Merge branch 'PHP-5.6'

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

e6874a9b419db82dcfefa0a260fb289577b414b6
diff --cc main/php_output.h
index b66fe7c066,3831478b9f..535b09b46c
--- a/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