- Change PHP_ to V_ (directory & file functions)

9 files changed, 11 insertions, 11 deletions

diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index dbbe242ab5..ca637f5732 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -571,7 +571,7 @@ PHP_FUNCTION(posix_getcwd)
 	char  buffer[MAXPATHLEN];
 	char *p;
 
-	p = PHP_GETCWD(buffer, MAXPATHLEN);
+	p = V_GETCWD(buffer, MAXPATHLEN);
 	if (!p) {
 		php_error(E_WARNING, "posix_getcwd() failed with '%s'",
 			strerror(errno));
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 03535b1148..2885bd95c5 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -210,7 +210,7 @@ PHP_FUNCTION(chdir)
 	}
 	convert_to_string_ex(arg);
 
-	ret = PHP_CHDIR((*arg)->value.str.val);
+	ret = V_CHDIR((*arg)->value.str.val);
 	
 	if (ret < 0) {
 		php_error(E_WARNING, "ChDir: %s (errno %d)", strerror(errno), errno);
@@ -234,9 +234,9 @@ PHP_FUNCTION(getcwd)
 	}
 
 #if HAVE_GETCWD
-	ret = PHP_GETCWD(path,MAXPATHLEN-1);
+	ret = V_GETCWD(path,MAXPATHLEN-1);
 #elif HAVE_GETWD
-	ret = PHP_GETWD(path);
+	ret = V_GETWD(path);
 /*
  * #warning is not ANSI C
  * #else
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 61959f32d2..81f70fdf14 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -387,7 +387,7 @@ PHP_FUNCTION(touch)
 	/* create the file if it doesn't exist already */
 	ret = stat((*filename)->value.str.val, &sb);
 	if (ret == -1) {
-		file = PHP_FOPEN((*filename)->value.str.val, "w");
+		file = V_FOPEN((*filename)->value.str.val, "w");
 		if (file == NULL) {
 			php_error(E_WARNING, "unable to create file %s because %s", (*filename)->value.str.val, strerror(errno));
 			if (newtime) efree(newtime);
diff --git a/ext/standard/image.c b/ext/standard/image.c
index 30930c253d..88de240736 100644
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -338,7 +338,7 @@ PHP_FUNCTION(getimagesize)
 	/* Check open_basedir */
 	if (php_check_open_basedir((*arg1)->value.str.val)) return;
 	
-	if ((fp = PHP_FOPEN((*arg1)->value.str.val,"rb")) == 0) {
+	if ((fp = V_FOPEN((*arg1)->value.str.val,"rb")) == 0) {
 		php_error(E_WARNING, "Unable to open %s", (*arg1)->value.str.val);
 		return;
 	}
diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c
index 619f95f5dc..c3563f13b5 100644
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@ -198,7 +198,7 @@ PHP_FUNCTION(iptcembed)
     if (php_check_open_basedir((*jpeg_file)->value.str.val)) 
 		RETURN_FALSE;
 
-    if ((fp = PHP_FOPEN((*jpeg_file)->value.str.val,"rb")) == 0) {
+    if ((fp = V_FOPEN((*jpeg_file)->value.str.val,"rb")) == 0) {
         php_error(E_WARNING, "Unable to open %s", (*jpeg_file)->value.str.val);
         RETURN_FALSE;
     }
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index f14c4800e6..c51600f70f 100644
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -483,7 +483,7 @@ int send_php(request_rec *r, int display_source_mode, char *filename)
 	SG(server_context) = r;
 	
 	php_save_umask();
-	PHP_CHDIR_FILE(filename);
+	V_CHDIR_FILE(filename);
 	add_common_vars(r);
 	add_cgi_vars(r);
 
diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index e85599100e..3ff47766dd 100644
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -457,7 +457,7 @@ static void init_request_info(sapi_globals_struct *sapi_globals, LPEXTENSION_CON
 
 		if (path_end) {
 			*path_end = 0;
-			PHP_CHDIR(SG(request_info).path_translated);
+			V_CHDIR(SG(request_info).path_translated);
 			*path_end = SEPARATOR;
 		}
 	}
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 87ee525809..b10d0d6287 100644
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -601,7 +601,7 @@ static int php_roxen_module_main(SLS_D)
   /* VERY BAD, but should work */
   if(len > 0) {
     dir[len] = '\0';
-    PHP_CHDIR(dir);
+    V_CHDIR(dir);
   }
   free(dir);
 #endif
diff --git a/win32/registry.c b/win32/registry.c
index 43903929ca..4f74374e8f 100644
--- a/win32/registry.c
+++ b/win32/registry.c
@@ -29,7 +29,7 @@ void UpdateIniFromRegistry(char *path)
 			char drive_letter;
 
 			/* get current working directory and prepend it to the path */
-			if (!PHP_GETCWD(tmp_buf, MAXPATHLEN)) {
+			if (!V_GETCWD(tmp_buf, MAXPATHLEN)) {
 				efree(orig_path);
 				return;
 			}