diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-09-04 08:18:15 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-09-04 08:18:15 +0000 |
| commit | 75876d57beb4aba5525a955851f96fd682dc07b4 (patch) | |
| tree | 99286b26cb6d524898de606a2e33d935bc6345aa | |
| parent | a5107c18035d2ca53e26bf425790aee2ad8fd56e (diff) | |
| download | php-git-75876d57beb4aba5525a955851f96fd682dc07b4.tar.gz | |
Fixed VIRTUAL_DIR inconsistency
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.h | 6 | ||||
| -rw-r--r-- | main/php.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/TSRM/tsrm_virtual_cwd.h b/TSRM/tsrm_virtual_cwd.h index b92f0f2875..33476e5ce3 100644 --- a/TSRM/tsrm_virtual_cwd.h +++ b/TSRM/tsrm_virtual_cwd.h @@ -37,8 +37,14 @@ #include <stdarg.h> #endif +#ifdef ZTS +#define VIRTUAL_DIR +#endif + #ifndef TSRM_WIN32 #include <unistd.h> +#else +#include <direct.h> #endif #if defined(__osf__) || defined(_AIX) diff --git a/main/php.h b/main/php.h index 4a26408cfc..0b4fd3306a 100644 --- a/main/php.h +++ b/main/php.h @@ -398,10 +398,6 @@ END_EXTERN_C() #define PUTC_H(c) (php_header_write(&(c), 1 TSRMLS_CC), (c)) -#ifdef ZTS -#define VIRTUAL_DIR -#endif - #include "php_streams.h" #include "php_memory_streams.h" #include "fopen_wrappers.h" |