diff options
| author | Andi Gutmans <andi@php.net> | 2000-09-03 18:58:46 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-09-03 18:58:46 +0000 |
| commit | 1109b9ab575708168edd4fedeb10731a52e4e968 (patch) | |
| tree | 85eaee18ef4f5405464098add76c812d2fd75b8e /TSRM | |
| parent | da19ff78f34e409e00ffde0b23b2f36bf04caf16 (diff) | |
| download | php-git-1109b9ab575708168edd4fedeb10731a52e4e968.tar.gz | |
- More TSRM work
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/tsrm_config.w32.h | 6 | ||||
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 7 | ||||
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.h | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/TSRM/tsrm_config.w32.h b/TSRM/tsrm_config.w32.h new file mode 100644 index 0000000000..709d9003f9 --- /dev/null +++ b/TSRM/tsrm_config.w32.h @@ -0,0 +1,6 @@ +#ifndef TSRM_CONFIG_W32_H +#define TSRM_CONFIG_W32_H + +#define HAVE_UTIME 1 + +#endif diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index f1ed8a0e3a..5589d75dcc 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -29,11 +29,6 @@ #include <fcntl.h> #include "tsrm_virtual_cwd.h" - -#ifndef TSRM_WIN32 -#include "tsrm_config.h" -#endif - #include "tsrm_strtok_r.h" @@ -513,7 +508,7 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode) return f; } -#if HAVE_UTIME || defined(TSRM_WIN32) +#if HAVE_UTIME CWD_API int virtual_utime(const char *filename, struct utimbuf *buf) { cwd_state new_state; diff --git a/TSRM/tsrm_virtual_cwd.h b/TSRM/tsrm_virtual_cwd.h index b6875dfe4b..8d4c2c32cd 100644 --- a/TSRM/tsrm_virtual_cwd.h +++ b/TSRM/tsrm_virtual_cwd.h @@ -26,6 +26,12 @@ # define TSRM_WIN32 #endif +#ifndef TSRM_WIN32 +# include "tsrm_config.h" +#else +# include "tsrm_config.w32.h" +#endif + #include <sys/types.h> #include <sys/stat.h> #include <ctype.h> |