X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8fdca65cf20ae4dba861fa6667d6e233cbb900cf..a4388683f1b20020b5425c59c401d6ab673860de:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index 6cb6e3f059..61e0b07afb 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -62,11 +62,16 @@ #include // SEEK_xxx constants #include // O_RDONLY &c +#ifndef __MWERKS__ #include // needed for stat #include // stat +#endif // Microsoft compiler loves underscores, feed them to it #ifdef _MSC_VER + + #ifndef __MWERKS__ + // functions #define open _open #define close _close @@ -81,6 +86,7 @@ #define stat _stat // constants + #define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY #define O_RDWR _O_RDWR @@ -90,6 +96,8 @@ #define S_IFDIR _S_IFDIR #define S_IFREG _S_IFREG + + #endif #define W_OK 2 #define R_OK 4 @@ -174,7 +182,8 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int access) { // if bOverwrite we create a new file or truncate the existing one, // otherwise we only create the new file and fail if it already exists - int fd = open(szFileName, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access); + int fd = open(szFileName, O_WRONLY | O_CREAT | + (bOverwrite ? O_TRUNC : O_EXCL), access); if ( fd == -1 ) { wxLogSysError(_("can't create file '%s'"), szFileName); @@ -246,7 +255,11 @@ off_t wxFile::Read(void *pBuf, off_t nCount) { wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); +#ifdef __MWERKS__ + int iRc = ::read(m_fd, (char*) pBuf, nCount); +#else int iRc = ::read(m_fd, pBuf, nCount); +#endif if ( iRc == -1 ) { wxLogSysError(_("can't read from file descriptor %d"), m_fd); return wxInvalidOffset; @@ -260,7 +273,11 @@ size_t wxFile::Write(const void *pBuf, size_t nCount) { wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); +#ifdef __MWERKS__ + int iRc = ::write(m_fd, (const char*) pBuf, nCount); +#else int iRc = ::write(m_fd, pBuf, nCount); +#endif if ( iRc == -1 ) { wxLogSysError(_("can't write to file descriptor %d"), m_fd); m_error = TRUE; @@ -340,7 +357,7 @@ off_t wxFile::Length() const { wxASSERT( IsOpened() ); - #ifdef _MSC_VER + #if defined( _MSC_VER ) && !defined( __MWERKS__ ) int iRc = _filelength(m_fd); #else int iRc = tell(m_fd); @@ -375,7 +392,7 @@ bool wxFile::Eof() const int iRc; - #if defined(__UNIX__) || defined(__GNUWIN32__) + #if defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) // @@ this doesn't work, of course, on unseekable file descriptors off_t ofsCur = Tell(), ofsMax = Length();