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

Use the posix S_ISREG instead of S_IFREG if it is defined. Fixes wxFileExists

Browse Source 
on DJGPP where S_IFREG is defined as 0.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-05-28 18:58:12 +00:00
parent 164a797204
commit 27d98837f3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/filefn.cpp
View File

@@ -299,16 +299,19 @@ wxFileExists (const wxString& filename)
return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY); return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
#else // !__WIN32__ #else // !__WIN32__
#ifndef S_ISREG
#define S_ISREG(mode) ((mode) & S_IFREG)
#endif
wxStructStat st; wxStructStat st;
#ifndef wxNEED_WX_UNISTD_H #ifndef wxNEED_WX_UNISTD_H
return (wxStat( filename.fn_str() , &st) == 0 && (st.st_mode & S_IFREG)) return (wxStat( filename.fn_str() , &st) == 0 && S_ISREG(st.st_mode))
#ifdef __OS2__ #ifdef __OS2__
|| (errno == EACCES) // if access is denied something with that name || (errno == EACCES) // if access is denied something with that name
// exists and is opened in exclusive mode. // exists and is opened in exclusive mode.
#endif #endif
; ;
#else #else
return wxStat( filename , &st) == 0 && (st.st_mode & S_IFREG); return wxStat( filename , &st) == 0 && S_ISREG(st.st_mode);
#endif #endif
#endif // __WIN32__/!__WIN32__ #endif // __WIN32__/!__WIN32__
} }