Updated testconf,
Compile fixes for docview and iostreams, SO_RCVTIMEO doesn't exist everywhere and must not be used for setting this option - only getting it on some systems Distrib things git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -38,10 +38,10 @@ WXDLLEXPORT wxOutputStream& wxEndL(wxOutputStream& o_stream);
|
||||
// wxStream: base classes
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#define wxStream_NOERROR wxSTR_NOERROR
|
||||
#define wxStream_EOF wxSTR_EOF
|
||||
#define wxStream_WRITE_ERR wxSTR_WRITE_ERROR
|
||||
#define wxStream_READ_ERR wxSTR_READ_ERROR
|
||||
#define wxStream_NOERROR wxSTREAM_NOERROR
|
||||
#define wxStream_EOF wxSTREAM_EOF
|
||||
#define wxStream_WRITE_ERR wxSTREAM_WRITE_ERROR
|
||||
#define wxStream_READ_ERR wxSTREAM_READ_ERROR
|
||||
|
||||
typedef enum {
|
||||
wxStream_NOERROR = 0,
|
||||
@@ -55,7 +55,7 @@ class WXDLLEXPORT wxStreamBase {
|
||||
wxStreamBase();
|
||||
virtual ~wxStreamBase();
|
||||
|
||||
bool operator!() const { return (LastError() != wxSTR_NOERROR); }
|
||||
bool operator!() const { return (LastError() != wxSTREAM_NOERROR); }
|
||||
wxStreamError LastError() const { return m_lasterror; }
|
||||
virtual size_t GetSize() const { return ~((size_t)0); }
|
||||
size_t StreamSize() const { return GetSize(); }
|
||||
|
Reference in New Issue
Block a user