[Scummvm-cvs-logs] SF.net SVN: scummvm:[54353] scummvm/trunk/common

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Nov 19 01:10:10 CET 2010


Revision: 54353
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54353&view=rev
Author:   fingolfin
Date:     2010-11-19 00:10:09 +0000 (Fri, 19 Nov 2010)

Log Message:
-----------
COMMON: Push #include stream.h from zlib.h to zlib.cpp

Modified Paths:
--------------
    scummvm/trunk/common/zlib.cpp
    scummvm/trunk/common/zlib.h

Modified: scummvm/trunk/common/zlib.cpp
===================================================================
--- scummvm/trunk/common/zlib.cpp	2010-11-18 22:46:29 UTC (rev 54352)
+++ scummvm/trunk/common/zlib.cpp	2010-11-19 00:10:09 UTC (rev 54353)
@@ -25,6 +25,7 @@
 
 #include "common/zlib.h"
 #include "common/util.h"
+#include "common/stream.h"
 
 #if defined(USE_ZLIB)
   #ifdef __SYMBIAN32__

Modified: scummvm/trunk/common/zlib.h
===================================================================
--- scummvm/trunk/common/zlib.h	2010-11-18 22:46:29 UTC (rev 54352)
+++ scummvm/trunk/common/zlib.h	2010-11-19 00:10:09 UTC (rev 54353)
@@ -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 @@
  * 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 @@
  * 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
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list