diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index f015082b7e..203f6a25b6 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -188,7 +188,7 @@ extern LONG APIENTRY _EXPORT || defined(__BORLANDC__) \ || defined(__DMC__) \ || defined(__WATCOMC__) \ - || (defined(__GNUWIN32__) || defined(__MINGW32__)) \ + || defined(__MINGW32__) \ || (defined(__MWERKS__) && defined(__MSL__)) #define wxGetOSFHandle(fd) ((HANDLE)_get_osfhandle(fd)) #endif diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 0df4b475a0..9f9846f969 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -1924,7 +1924,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) // wxFileKind wxGetFileKind(int fd) { -#if defined __WXMSW__ && !defined __WXWINCE__ && defined wxGetOSFHandle && !defined(__WINE__) +#if defined __WXMSW__ && !defined __WXWINCE__ && defined wxGetOSFHandle switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE) { case FILE_TYPE_CHAR: