X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce4169a4d129fc6cd165b2e9ccc5cf5d48356020..940ddb190cb3f67f3b1eb85c29133e829c3ab762:/src/common/zstream.cpp diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index 09953c87d1..1ae27ad74c 100644 --- a/src/common/zstream.cpp +++ b/src/common/zstream.cpp @@ -20,17 +20,21 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/defs.h" -#endif - #if wxUSE_ZLIB && wxUSE_STREAMS #include "wx/zstream.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/log.h" -#include "zlib.h" + +// When using configure, the path must be "zlib.h" I don't know +// what other ports (wxMac, wxMotif without configure) need here. + +#ifdef __WXMSW__ + #include "..\zlib\zlib.h" +#else + #include "zlib.h" +#endif #define ZSTREAM_BUFFER_SIZE 1024 @@ -44,8 +48,6 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream) int err; // I need a private stream buffer. - m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read); - m_i_destroybuf = TRUE; m_inflate = new z_stream_s; m_inflate->zalloc = (alloc_func)0; @@ -106,8 +108,6 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream) { int err; - m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write); - m_o_destroybuf = TRUE; m_deflate = new z_stream_s; m_deflate->zalloc = (alloc_func)0;