clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the Win32 tree compile again

Browse Source
This commit is contained in:
Zeev Suraski 1999-12-20 15:38:44 +00:00
parent 2603f1c419
commit f455a484bd
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/standard/filestat.c
View File

@ -106,8 +106,8 @@ PHP_RSHUTDOWN_FUNCTION(filestat)
PHP_FUNCTION(diskfreespace)
{
pval **path;
#ifdef WINDOWS
pval *path;
double bytesfree;
HINSTANCE kernel32;
@ -127,7 +127,6 @@ PHP_FUNCTION(diskfreespace)
DWORD TotalNumberOfClusters;
#else /* not - WINDOWS */
pval **path;
#if defined(HAVE_SYS_STATVFS_H) && defined(HAVE_STATVFS)
struct statvfs buf;
#elif defined(HAVE_SYS_STATFS_H) && defined(HAVE_STATFS)
@ -154,7 +153,7 @@ PHP_FUNCTION(diskfreespace)
/* It's available, so we can call it. */
if (gdfse) {
func = (gdfse_func)gdfse;
if (func(path->value.str.val,
if (func((*path)->value.str.val,
&FreeBytesAvailableToCaller,
&TotalNumberOfBytes,
&TotalNumberOfFreeBytes) == 0) RETURN_FALSE;
@ -166,7 +165,7 @@ PHP_FUNCTION(diskfreespace)
}
/* If it's not available, we just use GetDiskFreeSpace */
else {
if (GetDiskFreeSpace(path->value.str.val,
if (GetDiskFreeSpace((*path)->value.str.val,
&SectorsPerCluster, &BytesPerSector,
&NumberOfFreeClusters, &TotalNumberOfClusters) == 0) RETURN_FALSE;
bytesfree = (double)NumberOfFreeClusters * (double)SectorsPerCluster * (double)BytesPerSector;
@ -180,7 +179,7 @@ PHP_FUNCTION(diskfreespace)
#elif defined(OS2)
{
FSALLOCATE fsinfo;
char drive = path->value.str.val[0] & 95;
char drive = (*path)->value.str.val[0] & 95;
if (DosQueryFSInfo( drive ? drive - 64 : 0, FSIL_ALLOC, &fsinfo, sizeof( fsinfo ) ) == 0)
bytesfree = (double)fsinfo.cbSector * fsinfo.cSectorUnit * fsinfo.cUnitAvail;

2
ext/standard/info.c
View File

@ -100,7 +100,7 @@ PHPAPI void php_print_info(int flag)
#endif
php_printf("php.ini path: %s<br>\n", CONFIGURATION_FILE_PATH);
php_printf("ZEND_DEBUG=%d<br>\n", ZEND_DEBUG);
php_printf("SAPI=" PHP_SAPI "<br>\n");
/*php_printf("SAPI=" PHP_SAPI "<br>\n");*/
#ifdef ZTS
php_printf("ZTS is defined");
#else