Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix dll export

main/php_variables.c

@@ -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);

main/php_variables.h

@@ -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