From 27d98837f3b5589c40137f4a1fa75d28cde75c46 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Sun, 28 May 2006 18:58:12 +0000 Subject: [PATCH] Use the posix S_ISREG instead of S_IFREG if it is defined. Fixes wxFileExists 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 --- src/common/filefn.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 3bd9d7c1bb..dec3887eb3 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -299,16 +299,19 @@ wxFileExists (const wxString& filename) return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY); #else // !__WIN32__ + #ifndef S_ISREG + #define S_ISREG(mode) ((mode) & S_IFREG) + #endif wxStructStat st; #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__ || (errno == EACCES) // if access is denied something with that name // exists and is opened in exclusive mode. #endif ; #else - return wxStat( filename , &st) == 0 && (st.st_mode & S_IFREG); + return wxStat( filename , &st) == 0 && S_ISREG(st.st_mode); #endif #endif // __WIN32__/!__WIN32__ } -- 2.45.2