- Change macros from V_ to VCWD_ because of AIX name clash

6 files changed, 18 insertions, 18 deletions

diff --git a/main/SAPI.c b/main/SAPI.c
index b0bb456cae..8dc5e5890a 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -574,7 +574,7 @@ SAPI_API struct stat *sapi_get_stat()
 	if (sapi_module.get_stat) {
 		return sapi_module.get_stat(SLS_C);
 	} else {
-		if (!SG(request_info).path_translated || (V_STAT(SG(request_info).path_translated, &SG(global_stat))==-1)) {
+		if (!SG(request_info).path_translated || (VCWD_STAT(SG(request_info).path_translated, &SG(global_stat))==-1)) {
 			return NULL;
 		}
 		return &SG(global_stat);
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index af541f417e..217d35abd9 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -232,7 +232,7 @@ static FILE *php_fopen_and_set_opened_path(const char *path, char *mode, char **
 		if (php_check_open_basedir((char *)path)) {
 			return NULL;
 		}
-		fp = V_FOPEN(path, mode);
+		fp = VCWD_FOPEN(path, mode);
 		if (fp && opened_path) {
 			*opened_path = expand_filepath(path,NULL);
 		}
@@ -336,7 +336,7 @@ PHPAPI FILE *php_fopen_primary_script(void)
 		SG(request_info).path_translated = NULL;
 		return NULL;
 	}
-	fp = V_FOPEN(filename, "rb");
+	fp = VCWD_FOPEN(filename, "rb");
 
 	/* refuse to open anything that is not a regular file */
 	if (fp && (0 > fstat(fileno(fp), &st) || !S_ISREG(st.st_mode))) {
@@ -349,7 +349,7 @@ PHPAPI FILE *php_fopen_primary_script(void)
 		return NULL;
 	}
     if (!(SG(options) & SAPI_OPTION_NO_CHDIR)) {
-		V_CHDIR_FILE(filename);
+		VCWD_CHDIR_FILE(filename);
     }
 	SG(request_info).path_translated = filename;
 
@@ -406,7 +406,7 @@ PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char **
 		}
 		snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename);
 		if (PG(safe_mode)) {
-			if (V_STAT(trypath, &sb) == 0 && (!php_checkuid(trypath, mode, CHECKUID_CHECK_MODE_PARAM))) {
+			if (VCWD_STAT(trypath, &sb) == 0 && (!php_checkuid(trypath, mode, CHECKUID_CHECK_MODE_PARAM))) {
 				efree(pathbuf);
 				return NULL;
 			}
@@ -520,7 +520,7 @@ PHPAPI char *expand_filepath(const char *filepath, char *real_path)
 	char cwd[MAXPATHLEN];
 	char *result;
 
-	result = V_GETCWD(cwd, MAXPATHLEN);	
+	result = VCWD_GETCWD(cwd, MAXPATHLEN);	
 	if (!result) {
 		cwd[0] = '\0';
 	}
diff --git a/main/main.c b/main/main.c
index 04d0c16325..43c0c68a9a 100644
--- a/main/main.c
+++ b/main/main.c
@@ -267,7 +267,7 @@ void php_log_err(char *log_message)
 			return;
 		}
 #endif
-		log_file = V_FOPEN(PG(error_log), "a");
+		log_file = VCWD_FOPEN(PG(error_log), "a");
 		if (log_file != NULL) {
 			time(&error_time);
 			strftime(error_time_str, 128, "%d-%b-%Y %H:%M:%S", php_localtime_r(&error_time, &tmbuf)); 
@@ -1168,7 +1168,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_D
 
 	if (setjmp(EG(bailout))!=0) {
 		if (old_cwd[0] != '\0')
-			V_CHDIR(old_cwd);
+			VCWD_CHDIR(old_cwd);
 		free_alloca(old_cwd);
 		return EG(exit_status);
 	}
@@ -1181,8 +1181,8 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_D
 
 	if (primary_file->type == ZEND_HANDLE_FILENAME 
 			&& primary_file->filename) {
-		V_GETCWD(old_cwd, OLD_CWD_SIZE-1);
-		V_CHDIR_FILE(primary_file->filename);
+		VCWD_GETCWD(old_cwd, OLD_CWD_SIZE-1);
+		VCWD_CHDIR_FILE(primary_file->filename);
 	}
 
 	if (PG(auto_prepend_file) && PG(auto_prepend_file)[0]) {
@@ -1206,7 +1206,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_D
 	zend_execute_scripts(ZEND_REQUIRE CLS_CC ELS_CC, 3, prepend_file_p, primary_file, append_file_p);
 
 	if (old_cwd[0] != '\0')
-		V_CHDIR(old_cwd);
+		VCWD_CHDIR(old_cwd);
 	free_alloca(old_cwd);
 
 	return EG(exit_status);
diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index c9f29d9831..6ebcb2ed0f 100644
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c
@@ -114,7 +114,7 @@ static FILE *php_do_open_temporary_file(char *path, const char *pfx, char **open
 
 #ifdef PHP_WIN32
 	if (GetTempFileName(path, pfx, 0, opened_path)) {
-		fp = V_FOPEN(opened_path, "wb");
+		fp = VCWD_FOPEN(opened_path, "wb");
 	} else {
 		fp = NULL;
 	}
@@ -127,7 +127,7 @@ static FILE *php_do_open_temporary_file(char *path, const char *pfx, char **open
 	}
 #else
 	if (mktemp(opened_path)) {
-		fp = V_FOPEN(opened_path, "wb");
+		fp = VCWD_FOPEN(opened_path, "wb");
 	} else {
 		fp = NULL;
 	}
diff --git a/main/rfc1867.c b/main/rfc1867.c
index 6f2bb85b63..d4240d552f 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -85,7 +85,7 @@ static void register_http_post_files_variable_ex(char *var, zval *val, zval *htt
 
 static int unlink_filename(char **filename)
 {
-	V_UNLINK(*filename);
+	VCWD_UNLINK(*filename);
 	return 0;
 }
 
diff --git a/main/safe_mode.c b/main/safe_mode.c
index cd828a71e5..0421ad2c7d 100644
--- a/main/safe_mode.c
+++ b/main/safe_mode.c
@@ -70,7 +70,7 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
 	}
 		
 	if (mode != CHECKUID_ALLOW_ONLY_DIR) {
-		ret = V_STAT(filename, &sb);
+		ret = VCWD_STAT(filename, &sb);
 		if (ret < 0) {
 			if (mode == CHECKUID_DISALLOW_FILE_NOT_EXISTS) {
 				php_error(E_WARNING, "Unable to access %s", filename);
@@ -98,7 +98,7 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
 
 	if (s) {
 		*s='\0';
-		ret = V_STAT(filename, &sb);
+		ret = VCWD_STAT(filename, &sb);
 		*s='/';
 		if (ret < 0) {
 			php_error(E_WARNING, "Unable to access %s", filename);
@@ -107,11 +107,11 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
 		duid = sb.st_uid;
 	} else {
 		char cwd[MAXPATHLEN];
-		if (!V_GETCWD(cwd, MAXPATHLEN)) {
+		if (!VCWD_GETCWD(cwd, MAXPATHLEN)) {
 			php_error(E_WARNING, "Unable to access current working directory");
 			return 0;
 		}
-		ret = V_STAT(cwd, &sb);
+		ret = VCWD_STAT(cwd, &sb);
 		if (ret < 0) {
 			php_error(E_WARNING, "Unable to access %s", cwd);
 			return 0;