diff options
| author | Andi Gutmans <andi@php.net> | 2000-04-01 20:11:01 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-04-01 20:11:01 +0000 |
| commit | 997e63993bbbdff8c882d4b93805fcc6bbdfb9b0 (patch) | |
| tree | 53fb3a2acedf82bb7f8aad5603b35570d17c1d3d /main/php_virtual_cwd.h | |
| parent | 301f8feab4b6cb47bd493a6181a0af5b2d9497b5 (diff) | |
| download | php-git-997e63993bbbdff8c882d4b93805fcc6bbdfb9b0.tar.gz | |
- Move to new Zend macros
Diffstat (limited to 'main/php_virtual_cwd.h')
| -rw-r--r-- | main/php_virtual_cwd.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/main/php_virtual_cwd.h b/main/php_virtual_cwd.h index 035314c881..8b4f40a9dc 100644 --- a/main/php_virtual_cwd.h +++ b/main/php_virtual_cwd.h @@ -2,6 +2,7 @@ #define VIRTUAL_CWD_H #include "zend.h" +#include "zend_API.h" #ifdef ZEND_WIN32 # ifdef CWD_EXPORTS @@ -27,17 +28,17 @@ int virtual_chdir(char *path); int virtual_filepath(char *path, char **filepath); FILE *virtual_fopen(char *path, const char *mode); -typedef struct _cwd_globals_struct { +ZEND_BEGIN_MODULE_GLOBALS(cwd) cwd_state cwd; -} cwd_globals_struct; +ZEND_END_MODULE_GLOBALS(cwd) #ifdef ZTS -# define CWDLS_D cwd_globals_struct *cwd_globals +# define CWDLS_D zend_cwd_globals *cwd_globals # define CWDLS_DC , CWDLS_D # define CWDLS_C cwd_globals # define CWDLS_CC , CWDLS_C # define CWDG(v) (cwd_globals->v) -# define CWDLS_FETCH() cwd_globals_struct *cwd_globals = ts_resource(cwd_globals_id) +# 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 @@ -46,7 +47,7 @@ CWD_API extern int cwd_globals_id; # define CWDLS_CC # define CWDG(v) (cwd_globals.v) # define CWDLS_FETCH() -extern CWD_API cwd_globals_struct cwd_globals; +extern CWD_API zend_cwd_globals cwd_globals; #endif #endif /* VIRTUAL_CWD_H */ |