Fixed VIRTUAL_DIR inconsistency

diff --git a/TSRM/tsrm_virtual_cwd.h b/TSRM/tsrm_virtual_cwd.h
index b92f0f287545b07067d71d2c315712e41a288918..33476e5ce345f8031a5fd578ce81e537c62e9931 100644 (file)
--- 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 4a26408cfc7392f9a0cb256ebf962fb85bfc2944..0b4fd3306af73faad461c3b22edef6bd8aaad48f 100644 (file)
--- 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"