X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1427b705318677afe28b1291867f6930c8823a7..a1ee9ea29c3a00779d97be65b9f99e8f644b9a1a:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index 48683353e0..6cb6e3f059 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -53,6 +53,9 @@ #include // for GetTempFileName #elif (defined(__UNIX__) || defined(__GNUWIN32__)) #include +#elif (defined(__WXSTUBS__)) + // Have to ifdef this for different environments + #include #else #error "Please specify the header with file functions declarations." #endif //Win/UNIX @@ -94,6 +97,11 @@ #define tell(fd) lseek(fd, 0, SEEK_CUR) #endif //_MSC_VER +#ifdef __BORLANDC__ + #define W_OK 2 + #define R_OK 4 +#endif + // there is no distinction between text and binary files under Unix #ifdef __UNIX__ #define O_BINARY (0) @@ -124,7 +132,7 @@ bool wxFile::Exists(const char *name) bool wxFile::Access(const char *name, OpenMode mode) { - int how; + int how = 0; switch ( mode ) { case read: @@ -244,11 +252,11 @@ off_t wxFile::Read(void *pBuf, off_t nCount) return wxInvalidOffset; } else - return (uint)iRc; + return (size_t)iRc; } // write -uint wxFile::Write(const void *pBuf, uint nCount) +size_t wxFile::Write(const void *pBuf, size_t nCount) { wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); @@ -268,7 +276,7 @@ bool wxFile::Flush() if ( IsOpened() ) { // @@@ fsync() is not ANSI (BSDish) // if ( fsync(m_fd) == -1 ) { // TODO - if (TRUE) { + if (wxTrue) { wxLogSysError(_("can't flush file descriptor %d"), m_fd); return FALSE; } @@ -418,7 +426,7 @@ bool wxTempFile::Open(const wxString& strName) // otherwise rename() in Commit() might not work (if the files are on // different partitions for example). Unfortunately, the only standard // (POSIX) temp file creation function tmpnam() can't do it. - #ifdef __UNIX__ + #if defined(__UNIX__) || defined(__WXSTUBS__) static const char *szMktempSuffix = "XXXXXX"; m_strTemp << strName << szMktempSuffix; mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change