Oops. Put @echo off line back in. Only needed to change pythonw.exe to python.exe.

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

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 678b0d7485e32264eba7181ee2b327c8e3b44e71..5372d214811f04a391c2971d45bd6b6ef6da4b29 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -38,11 +38,7 @@
 #endif
 
 enum {
 #endif
 
 enum {

-#ifdef __WIN16__
-    ZSTREAM_BUFFER_SIZE = 4096
-#else

     ZSTREAM_BUFFER_SIZE = 16384
     ZSTREAM_BUFFER_SIZE = 16384

-#endif

 };
 
 //////////////////////
 };
 
 //////////////////////


@@ -61,12 +57,7 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream, int flags)
     m_inflate = new z_stream_s;
 
     if (m_inflate) {
     m_inflate = new z_stream_s;
 
     if (m_inflate) {

-      m_inflate->zalloc = (alloc_func)0;
-      m_inflate->zfree = (free_func)0;
-      m_inflate->opaque = (voidpf)0;
-      m_inflate->avail_in = 0;
-      m_inflate->next_in = NULL;
-      m_inflate->next_out = NULL;
+      memset(m_inflate, 0, sizeof(z_stream_s));

 
       wxASSERT((flags & ~(wxZLIB_ZLIB | wxZLIB_GZIP)) == 0);
  
 
       wxASSERT((flags & ~(wxZLIB_ZLIB | wxZLIB_GZIP)) == 0);
  


@@ -175,10 +166,7 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream,
      m_deflate = new z_stream_s;
 
      if (m_deflate) {
      m_deflate = new z_stream_s;
 
      if (m_deflate) {

-        m_deflate->zalloc = (alloc_func)0;
-        m_deflate->zfree = (free_func)0;
-        m_deflate->opaque = (voidpf)0;
-        m_deflate->avail_in = 0;
+        memset(m_deflate, 0, sizeof(z_stream_s));

         m_deflate->next_out = m_z_buffer;
         m_deflate->avail_out = m_z_size;
 
         m_deflate->next_out = m_z_buffer;
         m_deflate->avail_out = m_z_size;