archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Replace WINDOWS with PHP_WIN32 in ext/standard/filestat.c (#14464)

Browse source 
The WINDOWS symbol is project defined symbol in most cases and can be
replaced with PHP_WIN32 in this case at this point.
This commit is contained in:
Peter Kokot 2024-06-07 23:38:55 +02:00 • committed by GitHub
parent 271f91169e
commit 58f3b676f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ext/standard/filestat.c
View file

@ -105,7 +105,7 @@ PHP_RSHUTDOWN_FUNCTION(filestat) /* {{{ */
/* }}} */ /* }}} */
static zend_result php_disk_total_space(char *path, double *space) /* {{{ */ static zend_result php_disk_total_space(char *path, double *space) /* {{{ */
#if defined(WINDOWS) /* {{{ */ #if defined(PHP_WIN32) /* {{{ */
{ {
ULARGE_INTEGER FreeBytesAvailableToCaller; ULARGE_INTEGER FreeBytesAvailableToCaller;
ULARGE_INTEGER TotalNumberOfBytes; ULARGE_INTEGER TotalNumberOfBytes;
@ -128,7 +128,7 @@ static zend_result php_disk_total_space(char *path, double *space) /* {{{ */
return SUCCESS; return SUCCESS;
} }
/* }}} */ /* }}} */
#else /* {{{ if !defined(WINDOWS) */ #else /* {{{ if !defined(PHP_WIN32) */
{ {
double bytestotal = 0; double bytestotal = 0;
#if defined(HAVE_SYS_STATVFS_H) && defined(HAVE_STATVFS) #if defined(HAVE_SYS_STATVFS_H) && defined(HAVE_STATVFS)
@ -190,7 +190,7 @@ PHP_FUNCTION(disk_total_space)
/* }}} */ /* }}} */
static zend_result php_disk_free_space(char *path, double *space) /* {{{ */ static zend_result php_disk_free_space(char *path, double *space) /* {{{ */
#if defined(WINDOWS) /* {{{ */ #if defined(PHP_WIN32) /* {{{ */
{ {
ULARGE_INTEGER FreeBytesAvailableToCaller; ULARGE_INTEGER FreeBytesAvailableToCaller;
ULARGE_INTEGER TotalNumberOfBytes; ULARGE_INTEGER TotalNumberOfBytes;
@ -211,7 +211,7 @@ static zend_result php_disk_free_space(char *path, double *space) /* {{{ */
return SUCCESS; return SUCCESS;
} }
#else /* {{{ if !defined(WINDOWS) */ #else /* {{{ if !defined(PHP_WIN32) */
{ {
double bytesfree = 0; double bytesfree = 0;
#if defined(HAVE_SYS_STATVFS_H) && defined(HAVE_STATVFS) #if defined(HAVE_SYS_STATVFS_H) && defined(HAVE_STATVFS)
@ -309,7 +309,7 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
size_t filename_len; size_t filename_len;
zend_string *group_str; zend_string *group_str;
zend_long group_long; zend_long group_long;
#if !defined(WINDOWS) #if !defined(PHP_WIN32)
gid_t gid; gid_t gid;
int ret; int ret;
#endif #endif
@ -339,7 +339,7 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
RETURN_FALSE; RETURN_FALSE;
} }
} else { } else {
#ifndef WINDOWS #ifndef PHP_WIN32
/* On Windows, we expect regular chgrp to fail silently by default */ /* On Windows, we expect regular chgrp to fail silently by default */
php_error_docref(NULL, E_WARNING, "Cannot call chgrp() for a non-standard stream"); php_error_docref(NULL, E_WARNING, "Cannot call chgrp() for a non-standard stream");
#endif #endif
@ -347,7 +347,7 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
} }
} }
#ifdef WINDOWS #ifdef PHP_WIN32
/* We have no native chgrp on Windows, nothing left to do if stream doesn't have own implementation */ /* We have no native chgrp on Windows, nothing left to do if stream doesn't have own implementation */
RETURN_FALSE; RETURN_FALSE;
#else #else
@ -435,7 +435,7 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
size_t filename_len; size_t filename_len;
zend_string *user_str; zend_string *user_str;
zend_long user_long; zend_long user_long;
#if !defined(WINDOWS) #if !defined(PHP_WIN32)
uid_t uid; uid_t uid;
int ret; int ret;
#endif #endif
@ -465,7 +465,7 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
RETURN_FALSE; RETURN_FALSE;
} }
} else { } else {
#ifndef WINDOWS #ifndef PHP_WIN32
/* On Windows, we expect regular chown to fail silently by default */ /* On Windows, we expect regular chown to fail silently by default */
php_error_docref(NULL, E_WARNING, "Cannot call chown() for a non-standard stream"); php_error_docref(NULL, E_WARNING, "Cannot call chown() for a non-standard stream");
#endif #endif
@ -473,7 +473,7 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
} }
} }
#ifdef WINDOWS #ifdef PHP_WIN32
/* We have no native chown on Windows, nothing left to do if stream doesn't have own implementation */ /* We have no native chown on Windows, nothing left to do if stream doesn't have own implementation */
RETURN_FALSE; RETURN_FALSE;
#else #else