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

Fixed VIRTUAL_DIR inconsistency
---

diff --git a/TSRM/tsrm_virtual_cwd.h b/TSRM/tsrm_virtual_cwd.h
index 1dd4c33a68..3f4afc1275 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 5c5b9131fb..37635b024a 100644
--- 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"