cvs: php4 / php_virtual_cwd.c php_virtual_cwd.h
| From: | Andi Gutmans | Date: | Tue, 16 May 2000 14:47:55 +0000 |
| Subject: | cvs: php4 / php_virtual_cwd.c php_virtual_cwd.h | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-15081@lists.php.net to get a copy of this message | ||
andi Tue May 16 16:47:55 2000 EDT
Modified files:
/php4 php_virtual_cwd.c php_virtual_cwd.h
Log:
- Commit Sascha's patch to the virtual_cwd code. Will test it on Windows
soon.
Index: php4/php_virtual_cwd.c
diff -u php4/php_virtual_cwd.c:1.41 php4/php_virtual_cwd.c:1.42
--- php4/php_virtual_cwd.c:1.41 Thu May 4 13:36:33 2000
+++ php4/php_virtual_cwd.c Tue May 16 16:47:55 2000
@@ -19,7 +19,10 @@
#ifdef ZTS
#include "TSRM.h"
-#endif
+static int cwd_globals_id;
+#else
+static zend_cwd_globals cwd_globals;
+endif
ZEND_DECLARE_MODULE_GLOBALS(cwd);
Index: php4/php_virtual_cwd.h
diff -u php4/php_virtual_cwd.h:1.17 php4/php_virtual_cwd.h:1.18
--- php4/php_virtual_cwd.h:1.17 Sun Apr 30 05:06:00 2000
+++ php4/php_virtual_cwd.h Tue May 16 16:47:55 2000
@@ -61,7 +61,6 @@
# 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
@@ -69,7 +68,6 @@
# 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 */