Changes related to stream includes

[wxWidgets.git] / include / wx / zstream.h

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 326058f3fb61502b14e7d1bf55b95362ad806390..65fa71c6153f530096de238dd913c57c8691f0cd 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -8,15 +8,14 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __WXZSTREAM_H__
-#define __WXZSTREAM_H__
+#ifndef _WX_WXZSTREAM_H__
+#define _WX_WXZSTREAM_H__

 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include <wx/stream.h>
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include <wx/stream.h>

-#include "../zlib/zlib.h"

 
 class wxZlibInputStream: public wxFilterInputStream {
  public:
 
 class wxZlibInputStream: public wxFilterInputStream {
  public:


@@ -33,7 +32,7 @@ class wxZlibInputStream: public wxFilterInputStream {
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;

-  struct z_stream_s m_inflate;
+  struct z_stream_s *m_inflate;

 };
 
 class wxZlibOutputStream: public wxFilterOutputStream {
 };
 
 class wxZlibOutputStream: public wxFilterOutputStream {


@@ -53,7 +52,7 @@ class wxZlibOutputStream: public wxFilterOutputStream {
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;

-  struct z_stream_s m_deflate;
+  struct z_stream_s *m_deflate;

 };
 
 #endif
 };
 
 #endif