cvs: php4 / php_virtual_cwd.c php_virtual_cwd.h

andi Tue May 16 16:59:30 2000 EDT Modified files: /php4 php_virtual_cwd.c php_virtual_cwd.h Log: - Reverse the patch until I have time to look at it. The global id should be defined by ZEND_DECLARE_GLOBALS(cwd) Index: php4/php_virtual_cwd.c diff -u php4/php_virtual_cwd.c:1.42 php4/php_virtual_cwd.c:1.43 --- php4/php_virtual_cwd.c:1.42 Tue May 16 16:47:55 2000 +++ php4/php_virtual_cwd.c Tue May 16 16:59:30 2000 @@ -19,10 +19,7 @@ #ifdef ZTS #include "TSRM.h" -static int cwd_globals_id; -#else -static zend_cwd_globals cwd_globals; -endif +#endif ZEND_DECLARE_MODULE_GLOBALS(cwd); Index: php4/php_virtual_cwd.h diff -u php4/php_virtual_cwd.h:1.18 php4/php_virtual_cwd.h:1.19 --- php4/php_virtual_cwd.h:1.18 Tue May 16 16:47:55 2000 +++ php4/php_virtual_cwd.h Tue May 16 16:59:30 2000 @@ -61,6 +61,7 @@ # define CWDLS_CC , CWDLS_C # define CWDG(v) (cwd_globals->v) # define CWDLS_FETCH() zend_cwd_globals *cwd_globals = ts_resource(cwd_globals_id) +CWD_API extern int cwd_globals_id; #else # define CWDLS_D void # define CWDLS_DC @@ -68,6 +69,7 @@ # define CWDLS_CC # define CWDG(v) (cwd_globals.v) # define CWDLS_FETCH() +extern CWD_API zend_cwd_globals cwd_globals; #endif #endif /* VIRTUAL_CWD_H */