From 5c7d7a85db4f668c5a54279a69b4cfe7d7c6abef Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 19 Nov 2010 00:10:09 +0000
Subject: COMMON: Push #include stream.h from zlib.h to zlib.cpp

svn-id: r54353
---
 common/zlib.cpp | 1 +
 common/zlib.h   | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'common')

diff --git a/common/zlib.cpp b/common/zlib.cpp
index 7f04bd5a4f..98ecc10c1d 100644
--- a/common/zlib.cpp
+++ b/common/zlib.cpp
@@ -25,6 +25,7 @@
 
 #include "common/zlib.h"
 #include "common/util.h"
+#include "common/stream.h"
 
 #if defined(USE_ZLIB)
   #ifdef __SYMBIAN32__
diff --git a/common/zlib.h b/common/zlib.h
index 4da357d23c..641d4553cf 100644
--- a/common/zlib.h
+++ b/common/zlib.h
@@ -27,10 +27,12 @@
 #define COMMON_ZLIB_H
 
 #include "common/scummsys.h"
-#include "common/stream.h"
 
 namespace Common {
 
+class SeekableReadStream;
+class WriteStream;
+
 #if defined(USE_ZLIB)
 
 /**
@@ -54,7 +56,7 @@ bool uncompress(byte *dst, unsigned long *dstLen, const byte *src, unsigned long
  * It is safe to call this with a NULL parameter (in this case, NULL is
  * returned).
  */
-Common::SeekableReadStream *wrapCompressedReadStream(Common::SeekableReadStream *toBeWrapped);
+SeekableReadStream *wrapCompressedReadStream(SeekableReadStream *toBeWrapped);
 
 /**
  * Take an arbitrary WriteStream and wrap it in a custom stream which provides
@@ -65,7 +67,7 @@ Common::SeekableReadStream *wrapCompressedReadStream(Common::SeekableReadStream
  * It is safe to call this with a NULL parameter (in this case, NULL is
  * returned).
  */
-Common::WriteStream *wrapCompressedWriteStream(Common::WriteStream *toBeWrapped);
+WriteStream *wrapCompressedWriteStream(WriteStream *toBeWrapped);
 
 }	// End of namespace Common
 
-- 
cgit v1.2.3