archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.6'

Browse source 
* PHP-5.6:
  fix dll export
This commit is contained in:
Anatol Belski 2014-04-24 10:53:31 +02:00
commit 60f976a45e
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main/php_variables.c
View file

@ -694,7 +694,7 @@ static zend_bool php_auto_globals_create_request(const char *name, uint name_len
/* {{{ php_hash_environment
*/
int php_hash_environment(TSRMLS_D)
PHPAPI int php_hash_environment(TSRMLS_D)
{
memset(PG(http_globals), 0, sizeof(PG(http_globals)));
zend_activate_auto_globals(TSRMLS_C);

2
main/php_variables.h
View file

@ -41,7 +41,7 @@ PHPAPI void php_register_variable(char *var, char *val, zval *track_vars_array T
PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, zval *track_vars_array TSRMLS_DC);
PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_array TSRMLS_DC);
int php_hash_environment(TSRMLS_D);
PHPAPI int php_hash_environment(TSRMLS_D);
END_EXTERN_C()
#define NUM_TRACK_VARS 6