| Dmitry Stogov 2006-09-04, 3:56 am |
| dmitry Mon Sep 4 08:18:35 2006 UTC
Modified files:
/php-src/main php.h
/TSRM tsrm_virtual_cwd.h
Log:
Fixed VIRTUAL_DIR inconsistency
http://cvs.php.net/viewvc.cgi/php-s...3&diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.232 php-src/main/php.h:1.233
--- php-src/main/php.h:1.232 Tue Jun 13 13:12:18 2006
+++ php-src/main/php.h Mon Sep 4 08:18:35 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.232 2006/06/13 13:12:18 dmitry Exp $ */
+/* $Id: php.h,v 1.233 2006/09/04 08:18:35 dmitry Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -380,10 +380,6 @@
#include "main/php_output.h"
-#ifdef ZTS
-#define VIRTUAL_DIR
-#endif
-
#include "php_streams.h"
#include "php_memory_streams.h"
#include "fopen_wrappers.h"
http://cvs.php.net/viewvc.cgi/TSRM/...6&diff_format=u
Index: TSRM/tsrm_virtual_cwd.h
diff -u TSRM/tsrm_virtual_cwd.h:1.55 TSRM/tsrm_virtual_cwd.h:1.56
--- TSRM/tsrm_virtual_cwd.h:1.55 Fri Aug 4 17:29:15 2006
+++ TSRM/tsrm_virtual_cwd.h Mon Sep 4 08:18:35 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.h,v 1.55 2006/08/04 17:29:15 andrei Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.56 2006/09/04 08:18:35 dmitry Exp $ */
#ifndef VIRTUAL_CWD_H
#define 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)
|