summaryrefslogtreecommitdiff
path: root/main/php_virtual_cwd.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/php_virtual_cwd.c')
-rw-r--r--main/php_virtual_cwd.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/main/php_virtual_cwd.c b/main/php_virtual_cwd.c
index c233901b6e..054be6d044 100644
--- a/main/php_virtual_cwd.c
+++ b/main/php_virtual_cwd.c
@@ -31,6 +31,7 @@
#ifdef ZEND_WIN32
#include "win95nt.h"
+#include <sys/utime.h>
#endif
#include "php_virtual_cwd.h"
@@ -396,7 +397,7 @@ CWD_API int virtual_chdir(const char *path)
return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok)?-1:0;
}
-CWD_API int virtual_chdir_file(const char *path)
+CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path))
{
int length = strlen(path);
char *temp;
@@ -421,7 +422,7 @@ CWD_API int virtual_chdir_file(const char *path)
#if VIRTUAL_CWD_DEBUG
fprintf (stderr, "Changing directory to %s\n", temp);
#endif
- retval = virtual_chdir(temp);
+ retval = p_chdir(temp);
free(temp);
return retval;
}
@@ -732,6 +733,7 @@ CWD_API FILE *virtual_popen(const char *command, const char *type)
#endif
+#if 0
/* taken from Apache 1.3 */
CWD_API void virtual_real_chdir_file(const char *file)
@@ -752,6 +754,8 @@ CWD_API void virtual_real_chdir_file(const char *file)
* error... ah well. */
}
+#endif
+
#if 0
main(void)