diff options
| author | Andi Gutmans <andi@php.net> | 2000-06-24 16:10:18 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-06-24 16:10:18 +0000 |
| commit | 4b5e7d6618f8ea1b3a9f24376593bb44abb8a1ae (patch) | |
| tree | 496a52dcd684543f2cc1cedb96c7db69e8ed2d33 /main/php.h | |
| parent | dfaaa8ff953c5c9a947ae45f1d0eb060f23f7364 (diff) | |
| download | php-git-4b5e7d6618f8ea1b3a9f24376593bb44abb8a1ae.tar.gz | |
- Only use VIRTUAL_DIR in ZTS mode until it is thoroughly tested.
- Mutex popen() in Windows as the UNIX trick doesn't work there.
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/main/php.h b/main/php.h index ef79abba16..f1d743faab 100644 --- a/main/php.h +++ b/main/php.h @@ -284,7 +284,10 @@ 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)) +#ifdef ZTS #define VIRTUAL_DIR +#endif + #include "php_virtual_cwd.h" /* Virtual current directory support */ @@ -308,12 +311,7 @@ PHPAPI int cfg_get_string(char *varname, char **result); #define V_MKDIR(pathname, mode) virtual_mkdir(pathname, mode) #define V_RMDIR(pathname) virtual_rmdir(pathname) #define V_OPENDIR(pathname) virtual_opendir(pathname) -#ifdef PHP_WIN32 -/* Under Windows the "cd /cwd ; command" trick doesn't work */ -#define V_POPEN(command, type) popen(command, type) -#else #define V_POPEN(command, type) virtual_popen(command, type) -#endif #else |