- Fix another bug in session.c

- Start using the new PHP_GETCWD() and co. macros

1 files changed, 10 insertions, 0 deletions

diff --git a/main/php.h b/main/php.h
index 4bbb694b5f..484d8af81f 100644
--- a/main/php.h
+++ b/main/php.h
@@ -284,6 +284,16 @@ PHPAPI int cfg_get_string(char *varname, char **result);
 #define PUTS_H(str)					php_header_write((str), strlen((str)))
 #define PUTC_H(c)					(php_header_write(&(c), 1), (c))
 
+/* Virtual current directory support */
+#ifdef VIRTUAL_DIR
+#define PHP_GETCWD(buff, size) virtual_getcwd(buff,size)
+#define PHP_FOPEN(path, mode) virtual_fopen(path, mode)
+#define PHP_CHDIR(path) virtual_chdir(path)
+#else
+#define PHP_GETCWD(buff, size) getcwd(buff,size)
+#define PHP_FOPEN(path, mode)  fopen(path, mode)
+#define PHP_CHDIR(path) chdir(path)
+#endif
 
 #include "zend_constants.h"