cvs: /php4 php_virtual_cwd.c php_virtual_cwd.h
| From: | Andi Gutmans | Date: | Sat, 01 Apr 2000 18:23:16 +0000 |
| Subject: | cvs: /php4 php_virtual_cwd.c php_virtual_cwd.h | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-12997@lists.php.net to get a copy of this message | ||
andi Sat Apr 1 10:23:16 2000 EDT
Modified files:
/php4 php_virtual_cwd.c php_virtual_cwd.h
Log:
- PHP_WIN32 is not defined here use ZEND_WIN32
Index: php4/php_virtual_cwd.c
diff -u php4/php_virtual_cwd.c:1.18 php4/php_virtual_cwd.c:1.19
--- php4/php_virtual_cwd.c:1.18 Sat Apr 1 10:21:03 2000
+++ php4/php_virtual_cwd.c Sat Apr 1 10:22:46 2000
@@ -18,7 +18,7 @@
cwd_state true_global_cwd_state;
-#ifndef PHP_WIN32
+#ifndef ZEND_WIN32
#include <unistd.h>
#endif
@@ -30,7 +30,7 @@
#define S_ISREG(mode) ((mode) & _S_IFREG)
#endif
-#ifdef PHP_WIN32
+#ifdef ZEND_WIN32
#define strtok_r(a,b,c) strtok((a),(b))
#define IS_SLASH(c) ((c) == '/' || (c) == '\\')
#define DEFAULT_SLASH '\\'
@@ -152,7 +152,7 @@
return retval;
}
-#ifdef PHP_WIN32
+#ifdef ZEND_WIN32
/* If we have something like C: */
if (state->cwd_length == 2 && state->cwd[state->cwd_length-1] == ':') {
char *retval;
@@ -212,7 +212,7 @@
if (IS_ABSOLUTE_PATH(path, path_length)) {
copy_amount = COPY_WHEN_ABSOLUTE;
-#ifdef PHP_WIN32
+#ifdef ZEND_WIN32
} else if(IS_SLASH(path[0])) {
copy_amount = 2;
#endif
@@ -325,7 +325,7 @@
cwd_state state;
int length;
-#ifndef PHP_WIN32
+#ifndef ZEND_WIN32
state.cwd = malloc(PATH_MAX + 1);
state.cwd_length = PATH_MAX;
Index: php4/php_virtual_cwd.h
diff -u php4/php_virtual_cwd.h:1.4 php4/php_virtual_cwd.h:1.5
--- php4/php_virtual_cwd.h:1.4 Sat Apr 1 10:21:03 2000
+++ php4/php_virtual_cwd.h Sat Apr 1 10:22:46 2000
@@ -3,7 +3,7 @@
#include "zend.h"
-#ifdef PHP_WIN32
+#ifdef ZEND_WIN32
# ifdef CWD_EXPORTS
# define CWD_API __declspec(dllexport)
# else