From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 4 Sep 2006 08:18:15 +0000 (+0000)
Subject: Fixed VIRTUAL_DIR inconsistency
X-Git-Tag: php-5.2.0RC4~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75876d57beb4aba5525a955851f96fd682dc07b4;p=php

Fixed VIRTUAL_DIR inconsistency
---

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"