diff options
| author | Zeev Suraski <zeev@php.net> | 1999-12-20 15:38:44 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-12-20 15:38:44 +0000 |
| commit | f455a484bd7f6705e34cc9e64fc6731282cb86e6 (patch) | |
| tree | 2a45a0b87416d8d3603c7da113ae885fb0476d94 | |
| parent | 2603f1c4197977ce290f058480f103862b61b562 (diff) | |
| download | php-git-f455a484bd7f6705e34cc9e64fc6731282cb86e6.tar.gz | |
Make the Win32 tree compile again
| -rw-r--r-- | ext/standard/filestat.c | 9 | ||||
| -rw-r--r-- | ext/standard/info.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index 952f502106..39b5d47a33 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -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; diff --git a/ext/standard/info.c b/ext/standard/info.c index 6dcf0450eb..c9ddbcb479 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -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 |