diff options
| -rw-r--r-- | ext/standard/basic_functions.c | 2 | ||||
| -rw-r--r-- | ext/standard/streamsfuncs.c | 2 | ||||
| -rwxr-xr-x | win32/globals.c | 4 | ||||
| -rwxr-xr-x | win32/php_win32_globals.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index cae20b90a1..9148a66d19 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1015,7 +1015,7 @@ PHP_MINIT_FUNCTION(basic) #else basic_globals_ctor(&basic_globals TSRMLS_CC); #ifdef PHP_WIN32 - php_win32_core_globals_ctor(&php_win32_core_globals TSRMLS_CC); + php_win32_core_globals_ctor(&the_php_win32_core_globals TSRMLS_CC); #endif #endif diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 385de232eb..993188cb6d 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -1212,7 +1212,7 @@ PHP_FUNCTION(stream_socket_enable_crypto) if (ZEND_NUM_ARGS() >= 3) { if (zsessstream) { - php_stream_from_zval(sessstream, zsessstream); + php_stream_from_zval(sessstream, &zsessstream); } if (php_stream_xport_crypto_setup(stream, cryptokind, sessstream TSRMLS_CC) < 0) { diff --git a/win32/globals.c b/win32/globals.c index f77df9d4ba..c66823955d 100755 --- a/win32/globals.c +++ b/win32/globals.c @@ -24,7 +24,7 @@ #ifdef ZTS PHPAPI int php_win32_core_globals_id; #else -php_win32_core_globals php_win32_core_globals; +php_win32_core_globals the_php_win32_core_globals; #endif void php_win32_core_globals_ctor(void *vg TSRMLS_DC) @@ -39,7 +39,7 @@ PHP_RSHUTDOWN_FUNCTION(win32_core_globals) #ifdef ZTS ts_resource(php_win32_core_globals_id) #else - &php_win32_core_globals + &the_php_win32_core_globals #endif ; diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 7153478cda..113a7122a7 100755 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -31,8 +31,8 @@ typedef struct _php_win32_core_globals php_win32_core_globals; # define PW32G(v) TSRMG(php_win32_core_globals_id, php_win32_core_globals*, v) extern PHPAPI int php_win32_core_globals_id; #else -# define PW32G(v) (php_win32_core_globals.v) -extern PHPAPI struct _php_win32_core_globals php_win32_core_globals; +# define PW32G(v) (the_php_win32_core_globals.v) +extern PHPAPI struct _php_win32_core_globals the_php_win32_core_globals; #endif struct _php_win32_core_globals { |