diff options
| author | Andi Gutmans <andi@php.net> | 2000-05-16 14:59:30 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-05-16 14:59:30 +0000 |
| commit | 0aa5f2ea3c161e7ace096269b03e45e01e93c079 (patch) | |
| tree | b0d2e09bf9dc9d3f3d48249583e1275676942858 | |
| parent | 4e6e741af8f8f398112cbed67c2a6bd91127b3c9 (diff) | |
| download | php-git-0aa5f2ea3c161e7ace096269b03e45e01e93c079.tar.gz | |
- Reverse the patch until I have time to look at it. The global id should
be defined by ZEND_DECLARE_GLOBALS(cwd)
| -rw-r--r-- | main/php_virtual_cwd.c | 5 | ||||
| -rw-r--r-- | main/php_virtual_cwd.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/main/php_virtual_cwd.c b/main/php_virtual_cwd.c index be82671cfa..0275b5c029 100644 --- a/main/php_virtual_cwd.c +++ b/main/php_virtual_cwd.c @@ -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); diff --git a/main/php_virtual_cwd.h b/main/php_virtual_cwd.h index ecd93463b6..44745557c6 100644 --- a/main/php_virtual_cwd.h +++ b/main/php_virtual_cwd.h @@ -61,6 +61,7 @@ ZEND_END_MODULE_GLOBALS(cwd) # 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 @@ ZEND_END_MODULE_GLOBALS(cwd) # 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 */ |