The assumption that if SIZEOF_INT is defined then SIZEOF_SIZE_T is too

[wxWidgets.git] / src / common / wfstream.cpp

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 970f92c2961f830c386a99a405818d287879379b..e40bc2fcfa23f92d4cd511c5482b0499200b4e64 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -62,17 +62,17 @@ wxFileInputStream::~wxFileInputStream()
         delete m_file;
 }
 
         delete m_file;
 }
 

-size_t wxFileInputStream::GetSize() const
+wxFileOffset wxFileInputStream::GetLength() const

 {
     return m_file->Length();
 }
 
 size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {
 {
     return m_file->Length();
 }
 
 size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {

-    wxFileSize_t ret = m_file->Read(buffer, size);
+    ssize_t ret = m_file->Read(buffer, size);

 
     // NB: we can't use a switch here because HP-UX CC doesn't allow
 
     // NB: we can't use a switch here because HP-UX CC doesn't allow

-    //     switching over long long (which off_t is in 64bit mode)
+    //     switching over long long (which size_t is in 64bit mode)

 
     if ( !ret )
     {
 
     if ( !ret )
     {


@@ -176,7 +176,7 @@ void wxFileOutputStream::Sync()
     m_file->Flush();
 }
 
     m_file->Flush();
 }
 

-size_t wxFileOutputStream::GetSize() const
+wxFileOffset wxFileOutputStream::GetLength() const

 {
     return m_file->Length();
 }
 {
     return m_file->Length();
 }


@@ -227,14 +227,14 @@ wxFFileInputStream::~wxFFileInputStream()
         delete m_file;
 }
 
         delete m_file;
 }
 

-size_t wxFFileInputStream::GetSize() const
+wxFileOffset wxFFileInputStream::GetLength() const

 {
     return m_file->Length();
 }
 
 size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
 {
 {
     return m_file->Length();
 }
 
 size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
 {

-    wxFileSize_t ret = m_file->Read(buffer, size);
+    ssize_t ret = m_file->Read(buffer, size);

 
     if (m_file->Eof())
         m_lasterror = wxSTREAM_EOF;
 
     if (m_file->Eof())
         m_lasterror = wxSTREAM_EOF;


@@ -252,7 +252,7 @@ wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 #ifdef __VMS
 #pragma message disable intsignchange
 #endif
 #ifdef __VMS
 #pragma message disable intsignchange
 #endif

-   return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset );
+   return ( m_file->Seek(pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset );

 #ifdef __VMS
 #pragma message enable intsignchange
 #endif
 #ifdef __VMS
 #pragma message enable intsignchange
 #endif


@@ -331,7 +331,7 @@ wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 #ifdef __VMS
 #pragma message disable intsignchange
 #endif
 #ifdef __VMS
 #pragma message disable intsignchange
 #endif

-    return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset );
+    return ( m_file->Seek(pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset );

 #ifdef __VMS
 #pragma message enable intsignchange
 #endif
 #ifdef __VMS
 #pragma message enable intsignchange
 #endif


@@ -343,7 +343,7 @@ void wxFFileOutputStream::Sync()
     m_file->Flush();
 }
 
     m_file->Flush();
 }
 

-size_t wxFFileOutputStream::GetSize() const
+wxFileOffset wxFFileOutputStream::GetLength() const

 {
     return m_file->Length();
 }
 {
     return m_file->Length();
 }