X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30984deafc05d7c6f88db736336fe73d23a08e19..4f9cd1cb7f5ec341d322a4d16d933560699bde1f:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index 55d70d03db..a4b94e28ca 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -144,14 +144,6 @@ #include "wx/msw/private.h" #endif -#if !defined __UNIX__ && !defined __DJGPP__ - #ifdef __WXWINCE__ - typedef int ssize_t; - #else - typedef ptrdiff_t ssize_t; - #endif -#endif -wxCOMPILE_TIME_ASSERT(sizeof(ssize_t) == sizeof(size_t), ssize_t_wrong_size); // ============================================================================ // implementation of wxFile @@ -307,7 +299,7 @@ bool wxFile::Close() // ---------------------------------------------------------------------------- // read -size_t wxFile::Read(void *pBuf, size_t nCount) +ssize_t wxFile::Read(void *pBuf, size_t nCount) { wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); @@ -316,7 +308,7 @@ size_t wxFile::Read(void *pBuf, size_t nCount) if ( iRc == -1 ) { wxLogSysError(_("can't read from file descriptor %d"), m_fd); - return (size_t)wxInvalidOffset; + return wxInvalidOffset; } return iRc;