cvs: php-src /ext/standard basic_functions.c streamsfuncs.c /win32 globals.c php_win32_globals.h

wez Sat Jul 31 13:28:27 2004 EDT Modified files: /php-src/ext/standard basic_functions.c streamsfuncs.c /php-src/win32 globals.c php_win32_globals.h Log: Allow win32 stuff to build non-zts. Fix stream crypto func (again? didn't I already commit that?) http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.678&r2=1.679&ty=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.678 php-src/ext/standard/basic_functions.c:1.679 --- php-src/ext/standard/basic_functions.c:1.678 Thu Jul 29 07:54:12 2004 +++ php-src/ext/standard/basic_functions.c Sat Jul 31 13:28:27 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.678 2004/07/29 11:54:12 wez Exp $ */ +/* $Id: basic_functions.c,v 1.679 2004/07/31 17:28:27 wez Exp $ */ #include "php.h" #include "php_streams.h" @@ -1015,7 +1015,7 @@ #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 http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.38&r2=1.39&ty=u Index: php-src/ext/standard/streamsfuncs.c diff -u php-src/ext/standard/streamsfuncs.c:1.38 php-src/ext/standard/streamsfuncs.c:1.39 --- php-src/ext/standard/streamsfuncs.c:1.38 Wed Jul 28 19:34:27 2004 +++ php-src/ext/standard/streamsfuncs.c Sat Jul 31 13:28:27 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.38 2004/07/28 23:34:27 iliaa Exp $ */ +/* $Id: streamsfuncs.c,v 1.39 2004/07/31 17:28:27 wez Exp $ */ #include "php.h" #include "php_globals.h" @@ -1212,7 +1212,7 @@ 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) { http://cvs.php.net/diff.php/php-src/win32/globals.c?r1=1.3&r2=1.4&ty=u Index: php-src/win32/globals.c diff -u php-src/win32/globals.c:1.3 php-src/win32/globals.c:1.4 --- php-src/win32/globals.c:1.3 Fri Jul 30 12:49:55 2004 +++ php-src/win32/globals.c Sat Jul 31 13:28:27 2004 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: globals.c,v 1.3 2004/07/30 16:49:55 fmk Exp $ */ +/* $Id: globals.c,v 1.4 2004/07/31 17:28:27 wez Exp $ */ #include "php.h" #include "php_win32_globals.h" @@ -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 @@ #ifdef ZTS ts_resource(php_win32_core_globals_id) #else - &php_win32_core_globals + &the_php_win32_core_globals #endif ; http://cvs.php.net/diff.php/php-src/win32/php_win32_globals.h?r1=1.2&r2=1.3&ty=u Index: php-src/win32/php_win32_globals.h diff -u php-src/win32/php_win32_globals.h:1.2 php-src/win32/php_win32_globals.h:1.3 --- php-src/win32/php_win32_globals.h:1.2 Fri Jul 30 12:49:55 2004 +++ php-src/win32/php_win32_globals.h Sat Jul 31 13:28:27 2004 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_win32_globals.h,v 1.2 2004/07/30 16:49:55 fmk Exp $ */ +/* $Id: php_win32_globals.h,v 1.3 2004/07/31 17:28:27 wez Exp $ */ #ifndef PHP_WIN32_GLOBALS_H #define PHP_WIN32_GLOBALS_H @@ -31,8 +31,8 @@ # 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 {