| Dmitry Stogov 2006-09-04, 3:56 am |
| dmitry Mon Sep 4 08:18:15 2006 UTC
Modified files: (Branch: PHP_5_2)
/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.221.2.4.2.2 php-src/main/php.h:1.221.2.4.2.3
--- php-src/main/php.h:1.221.2.4.2.2 Thu Jun 15 14:06:35 2006
+++ php-src/main/php.h Mon Sep 4 08:18:15 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.221.2.4.2.2 2006/06/15 14:06:35 dmitry Exp $ */
+/* $Id: php.h,v 1.221.2.4.2.3 2006/09/04 08:18:15 dmitry Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -398,10 +398,6 @@
#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"
http://cvs.php.net/viewvc.cgi/TSRM/...1&diff_format=u
Index: TSRM/tsrm_virtual_cwd.h
diff -u TSRM/tsrm_virtual_cwd.h:1.48.2.5 TSRM/tsrm_virtual_cwd.h:1.48.2.5.2.1
--- TSRM/tsrm_virtual_cwd.h:1.48.2.5 Mon Apr 10 11:56:18 2006
+++ TSRM/tsrm_virtual_cwd.h Mon Sep 4 08:18:15 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.h,v 1.48.2.5 2006/04/10 11:56:18 sniper Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.48.2.5.2.1 2006/09/04 08:18:15 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)
|