Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable the huge files patch to build with mingw-cross.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2004-09-26 13:18:46 +00:00
parent 6ea3ac58ea
commit 4004775e5a
13 changed files with 96 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/filefn.h
View File

@@ -183,6 +183,8 @@ enum wxSeekMode
// Not all of the Win32 compilers do have huge file support, for example
// the Digitalmars compiler does not have huge file size support
#include "wx/msw/private.h"
#undef __HUGEFILES_SUPPORTED
#if _INTEGRAL_MAX_BITS >= 64 && !defined(__DMC__)
#define __HUGEFILES_SUPPORTED 1
@@ -199,7 +201,7 @@ enum wxSeekMode
typedef wxLongLong_t wxFileOffset;
#define wxFileOffsetFmtSpec wxLongLongFmtSpec
#else
typedef int wxFileOffset;
typedef off_t wxFileOffset;
#define wxFileOffsetFmtSpec _("")
#endif

8
include/wx/mstream.h
View File

@@ -35,8 +35,8 @@ protected:
wxStreamBuffer *m_i_streambuf;
size_t OnSysRead(void *buffer, size_t nbytes);
off_t OnSysSeek(off_t pos, wxSeekMode mode);
off_t OnSysTell() const;
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const;
private:
size_t m_length;
@@ -64,8 +64,8 @@ protected:
protected:
size_t OnSysWrite(const void *buffer, size_t nbytes);
off_t OnSysSeek(off_t pos, wxSeekMode mode);
off_t OnSysTell() const;
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const;
DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
};

8
include/wx/sckstrm.h
View File

@@ -27,9 +27,9 @@ class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
wxSocketOutputStream(wxSocketBase& s);
~wxSocketOutputStream();
off_t SeekO( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
wxFileOffset SeekO( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
{ return -1; }
off_t TellO() const
wxFileOffset TellO() const
{ return -1; }
protected:
@@ -46,9 +46,9 @@ class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
wxSocketInputStream(wxSocketBase& s);
~wxSocketInputStream();
off_t SeekI( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
wxFileOffset SeekI( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
{ return -1; }
off_t TellI() const
wxFileOffset TellI() const
{ return -1; }
protected:

6
include/wx/sstream.h
View File

@@ -34,8 +34,8 @@ public:
virtual size_t GetSize() const { return m_str.length(); }
protected:
virtual off_t OnSysSeek(off_t ofs, wxSeekMode mode);
virtual off_t OnSysTell() const;
virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
virtual size_t OnSysRead(void *buffer, size_t size);
private:
@@ -68,7 +68,7 @@ public:
const wxString& GetString() const { return *m_str; }
protected:
virtual off_t OnSysTell() const;
virtual wxFileOffset OnSysTell() const;
virtual size_t OnSysWrite(const void *buffer, size_t size);
private:

36
include/wx/stream.h
View File

@@ -91,8 +91,8 @@ public:
#endif // WXWIN_COMPATIBILITY_2_2
protected:
virtual off_t OnSysSeek(off_t seek, wxSeekMode mode);
virtual off_t OnSysTell() const;
virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
size_t m_lastcount;
wxStreamError m_lasterror;
@@ -192,10 +192,10 @@ public:
// it)
//
// returns wxInvalidOffset on error
virtual off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
virtual wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart);
// return the current position of the stream pointer or wxInvalidOffset
virtual off_t TellI() const;
virtual wxFileOffset TellI() const;
// stream-like operators
@@ -250,8 +250,8 @@ public:
virtual wxOutputStream& Write(const void *buffer, size_t size);
wxOutputStream& Write(wxInputStream& stream_in);
virtual off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
virtual off_t TellO() const;
virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart);
virtual wxFileOffset TellO() const;
virtual size_t LastWrite() const { return wxStreamBase::m_lastcount; }
@@ -288,8 +288,8 @@ public:
protected:
virtual size_t OnSysWrite(const void *buffer, size_t size);
virtual off_t OnSysSeek(off_t pos, wxSeekMode mode);
virtual off_t OnSysTell() const;
virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
size_t m_currentPos;
@@ -368,8 +368,8 @@ public:
virtual char Peek();
virtual char GetChar();
virtual void PutChar(char c);
virtual off_t Tell() const;
virtual off_t Seek(off_t pos, wxSeekMode mode);
virtual wxFileOffset Tell() const;
virtual wxFileOffset Seek(wxFileOffset pos, wxSeekMode mode);
// Buffer control
void ResetBuffer();
@@ -475,8 +475,8 @@ public:
wxInputStream& Read(void *buffer, size_t size);
// Position functions
off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
off_t TellI() const;
wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart);
wxFileOffset TellI() const;
// the buffer given to the stream will be deleted by it
void SetInputStreamBuffer(wxStreamBuffer *buffer);
@@ -487,8 +487,8 @@ public:
protected:
virtual size_t OnSysRead(void *buffer, size_t bufsize);
virtual off_t OnSysSeek(off_t seek, wxSeekMode mode);
virtual off_t OnSysTell() const;
virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
wxStreamBuffer *m_i_streambuf;
@@ -510,8 +510,8 @@ public:
wxOutputStream& Write(const void *buffer, size_t size);
// Position functions
off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
off_t TellO() const;
wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart);
wxFileOffset TellO() const;
void Sync();
@@ -526,8 +526,8 @@ public:
protected:
virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
virtual off_t OnSysSeek(off_t seek, wxSeekMode mode);
virtual off_t OnSysTell() const;
virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
wxStreamBuffer *m_o_streambuf;

16
include/wx/wfstream.h
View File

@@ -45,8 +45,8 @@ class WXDLLIMPEXP_BASE wxFileInputStream: public wxInputStream {
wxFileInputStream();
size_t OnSysRead(void *buffer, size_t size);
off_t OnSysSeek(off_t pos, wxSeekMode mode);
off_t OnSysTell() const;
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const;
protected:
wxFile *m_file;
@@ -75,8 +75,8 @@ class WXDLLIMPEXP_BASE wxFileOutputStream: public wxOutputStream {
wxFileOutputStream();
size_t OnSysWrite(const void *buffer, size_t size);
off_t OnSysSeek(off_t pos, wxSeekMode mode);
off_t OnSysTell() const;
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const;
protected:
wxFile *m_file;
@@ -114,8 +114,8 @@ class WXDLLIMPEXP_BASE wxFFileInputStream: public wxInputStream {
wxFFileInputStream();
size_t OnSysRead(void *buffer, size_t size);
off_t OnSysSeek(off_t pos, wxSeekMode mode);
off_t OnSysTell() const;
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const;
protected:
wxFFile *m_file;
@@ -144,8 +144,8 @@ class WXDLLIMPEXP_BASE wxFFileOutputStream: public wxOutputStream {
wxFFileOutputStream();
size_t OnSysWrite(const void *buffer, size_t size);
off_t OnSysSeek(off_t pos, wxSeekMode mode);
off_t OnSysTell() const;
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const;
protected:
wxFFile *m_file;

6
include/wx/zipstrm.h
View File

@@ -39,12 +39,12 @@ public:
protected:
virtual size_t OnSysRead(void *buffer, size_t bufsize);
virtual off_t OnSysSeek(off_t seek, wxSeekMode mode);
virtual off_t OnSysTell() const {return m_Pos;}
virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const {return m_Pos;}
private:
size_t m_Size;
off_t m_Pos;
wxFileOffset m_Pos;
// this void* is handle of archive . I'm sorry it is void and not proper
// type but I don't want to make unzip.h header public.

8
include/wx/zstream.h
View File

@@ -52,13 +52,13 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
protected:
size_t OnSysRead(void *buffer, size_t size);
off_t OnSysTell() const { return m_pos; }
wxFileOffset OnSysTell() const { return m_pos; }
protected:
size_t m_z_size;
unsigned char *m_z_buffer;
struct z_stream_s *m_inflate;
off_t m_pos;
wxFileOffset m_pos;
#if WXWIN_COMPATIBILITY_2_4
bool m_24compatibilty;
#endif
@@ -78,7 +78,7 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
protected:
size_t OnSysWrite(const void *buffer, size_t size);
off_t OnSysTell() const { return m_pos; }
wxFileOffset OnSysTell() const { return m_pos; }
virtual void DoFlush(bool final);
@@ -86,7 +86,7 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
size_t m_z_size;
unsigned char *m_z_buffer;
struct z_stream_s *m_deflate;
off_t m_pos;
wxFileOffset m_pos;
DECLARE_NO_COPY_CLASS(wxZlibOutputStream)
};