Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use WX_STATVFS_T instead of trying to guess statvfs() argument

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-01-13 21:55:24 +00:00
parent 54ab82b3f9
commit 85da04e95b
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/unix/utilsunx.cpp
View File

@@ -28,30 +28,32 @@
#include "wx/wfstream.h" #include "wx/wfstream.h"
// not only the statfs syscall is called differently depending on platform, but
// one of its incarnations, statvfs(), takes different arguments under
// different platforms and even different versions of the same system (Solaris
// 7 and 8): if you want to test for this, don't forget that the problems only
// appear if the large files support is enabled
#ifdef HAVE_STATFS #ifdef HAVE_STATFS
# ifdef __BSD__ #ifdef __BSD__
# include <sys/param.h> #include <sys/param.h>
# include <sys/mount.h> #include <sys/mount.h>
# else #else // !__BSD__
# include <sys/vfs.h> #include <sys/vfs.h>
# endif #endif // __BSD__/!__BSD__
#define wxStatfs statfs
#endif // HAVE_STATFS #endif // HAVE_STATFS
// not only the statfs syscall is called differently depending on platform, but
// we also can't use "struct statvfs" under Solaris because it breaks down if
// HAVE_LARGEFILE_SUPPORT == 1 and we must use statvfs_t instead
#ifdef HAVE_STATVFS #ifdef HAVE_STATVFS
#include <sys/statvfs.h> #include <sys/statvfs.h>
#define statfs statvfs #define wxStatfs statvfs
# ifdef __HPUX__ #endif // HAVE_STATVFS
#define wxStatFs struct statvfs
# else #if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
#define wxStatFs statvfs_t // WX_STATFS_T is detected by configure
# endif #define wxStatfs_t WX_STATFS_T
#elif HAVE_STATFS #endif
#define wxStatFs struct statfs
#endif // HAVE_STAT[V]FS
#if wxUSE_GUI #if wxUSE_GUI
#include "wx/unix/execute.h" #include "wx/unix/execute.h"
@@ -1024,8 +1026,8 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
{ {
#if defined(HAVE_STATFS) || defined(HAVE_STATVFS) #if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
// the case to "char *" is needed for AIX 4.3 // the case to "char *" is needed for AIX 4.3
wxStatFs fs; wxStatfs_t fs;
if ( statfs((char *)(const char*)path.fn_str(), &fs) != 0 ) if ( wxStatfs((char *)(const char*)path.fn_str(), &fs) != 0 )
{ {
wxLogSysError( wxT("Failed to get file system statistics") ); wxLogSysError( wxT("Failed to get file system statistics") );