Fixed VIRTUAL_DIR inconsistency

diff --git a/TSRM/tsrm_virtual_cwd.h b/TSRM/tsrm_virtual_cwd.h
index 1dd4c33a68f06800b7ea54962adeeb88c5dfddfa..3f4afc1275e0d89cf8cc09538d90e5279446355a 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 5c5b9131fb6bb350f07cdb2c9ef36ab3bc4fa395..37635b024af5a2c83f99202d3f8cda05f0ef8c14 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -380,10 +380,6 @@ END_EXTERN_C()
 #include "main/php_output.h"
 
 
-#ifdef ZTS
-#define VIRTUAL_DIR
-#endif
-
 #include "php_streams.h"
 #include "php_memory_streams.h"
 #include "fopen_wrappers.h"