X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6f2a8911e509fd9e61f881cc881a97f5aa05ae8..59396417d3285f933762d252d33ed095e6ffe299:/include/wx/filefn.h?ds=sidebyside diff --git a/include/wx/filefn.h b/include/wx/filefn.h index c47f40a2ca..ba57e38001 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -159,7 +159,7 @@ enum wxFileKind #define wxCRT_RmDir _wrmdir #define wxCRT_Stat _wstat #define wxStructStat struct _stat -#elif defined(__WXMSW__) && !defined(__WXPALMOS__) && \ +#elif (defined(__WXMSW__) || defined(__OS2__)) && !defined(__WXPALMOS__) && \ ( \ defined(__VISUALC__) || \ (defined(__MINGW32__) && !defined(__WINE__) && \ @@ -326,7 +326,12 @@ enum wxFileKind #ifdef wxHAS_HUGE_FILES #define wxCRT_Stat wxPOSIX_IDENT(stati64) #else - #define wxCRT_Stat wxPOSIX_IDENT(stat) + // Unfortunately Watcom is not consistent, so:- + #if defined(__OS2__) && defined(__WATCOMC__) + #define wxCRT_Stat _stat + #else + #define wxCRT_Stat wxPOSIX_IDENT(stat) + #endif #endif #endif // wxUSE_UNICODE/!wxUSE_UNICODE @@ -436,7 +441,7 @@ inline int wxLstat(const wxString& path, wxStructStat *buf) { return wxCRT_Lstat(path.fn_str(), buf); } inline int wxRmDir(const wxString& path) { return wxCRT_RmDir(path.fn_str()); } -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) || (defined(__OS2__) && defined(__WATCOMC__)) inline int wxMkDir(const wxString& path, mode_t WXUNUSED(mode) = 0) { return wxCRT_MkDir(path.fn_str()); } #else