Allow win32 stuff to build non-zts.

Fix stream crypto func (again? didn't I already commit that?)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index cae20b90a1a1a115cf9a16b7ae1a47ed7f6d6e63..9148a66d192f7722c8492a592c03777d01b85898 100644 (file)
--- 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 385de232ebaa90b07d963675c2f7bd46586bff4b..993188cb6da84c6dd9372fafa0098f887fbd3590 100644 (file)
--- 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 f77df9d4ba4154dda87fee674f38a542df4ad1f8..c66823955d2e2394fee6d953340f99e6569ab209 100755 (executable)
--- 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 7153478cda363419d47481f7113594b58581c294..113a7122a7d1752d5abe11415ce4ce7801e5ac30 100755 (executable)
--- 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 {