mirror of
https://github.com/php/php-src.git
synced 2026-04-08 08:33:06 +02:00
- Reverse the patch until I have time to look at it. The global id should
be defined by ZEND_DECLARE_GLOBALS(cwd)
This commit is contained in:
@@ -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);
|
||||
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user