- Commit Sascha's patch to the virtual_cwd code. Will test it on Windows

  soon.

diff --git a/main/php_virtual_cwd.c b/main/php_virtual_cwd.c
index 0275b5c029224d771fc0435df601e10fa19b73a3..be82671cfa73e2eeec8b9e55114baac8fc3e3fc7 100644 (file)
--- a/main/php_virtual_cwd.c
+++ b/main/php_virtual_cwd.c
@@ -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);
 

diff --git a/main/php_virtual_cwd.h b/main/php_virtual_cwd.h
index 44745557c69cb86230fdf6252f0f39144555a5a6..ecd93463b69aba58b3998b45776c820850aabcde 100644 (file)
--- a/main/php_virtual_cwd.h
+++ b/main/php_virtual_cwd.h
@@ -61,7 +61,6 @@ 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
@@ -69,7 +68,6 @@ CWD_API extern int cwd_globals_id;
 # 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 */