Fix for problem with wxGetFileKind on WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -459,7 +459,7 @@ WXDLLIMPEXP_BASE bool wxRmdir(const wxString& dir, int flags = 0);
|
|||||||
|
|
||||||
// Return the type of an open file
|
// Return the type of an open file
|
||||||
WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(int fd);
|
WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(int fd);
|
||||||
inline wxFileKind wxGetFileKind (FILE *fp) { return wxGetFileKind(fileno(fp)); }
|
WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(FILE *fp);
|
||||||
|
|
||||||
// compatibility defines, don't use in new code
|
// compatibility defines, don't use in new code
|
||||||
#define wxDirExists wxPathExists
|
#define wxDirExists wxPathExists
|
||||||
|
@@ -1936,11 +1936,22 @@ wxFileKind wxGetFileKind(int fd)
|
|||||||
return wxFILE_KIND_DISK;
|
return wxFILE_KIND_DISK;
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
#define wxFILEKIND_STUB
|
||||||
(void)fd;
|
(void)fd;
|
||||||
return wxFILE_KIND_DISK;
|
return wxFILE_KIND_DISK;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxFileKind wxGetFileKind(FILE *fp)
|
||||||
|
{
|
||||||
|
#ifndef wxFILEKIND_STUB
|
||||||
|
return wxGetFileKind(fileno(fp));
|
||||||
|
#else
|
||||||
|
(void)fp;
|
||||||
|
return wxFILE_KIND_DISK;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef __VISUALC__
|
#ifdef __VISUALC__
|
||||||
#pragma warning(default:4706) // assignment within conditional expression
|
#pragma warning(default:4706) // assignment within conditional expression
|
||||||
#endif // VC++
|
#endif // VC++
|
||||||
|
Reference in New Issue
Block a user