diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/posix/posix.c | 2 | ||||
| -rw-r--r-- | ext/standard/dir.c | 6 | ||||
| -rw-r--r-- | ext/standard/filestat.c | 2 | ||||
| -rw-r--r-- | ext/standard/image.c | 2 | ||||
| -rw-r--r-- | ext/standard/iptc.c | 2 |
5 files changed, 7 insertions, 7 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; } |