More _T() in asserts...

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

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index c917e493a47f8583e281c87167ac24f2f08f68a6..8ccb8710db3fe5e622d065a4742c6609a0fcf3d5 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -20,17 +20,22 @@
   #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/zlib.h"
+
+// When using configure, the path must be "zlib.h" I don't know
+// what other ports (wxMac, wxMotif without configure) need here.
+// If we are building with configure (defines __WX_SETUP_H__), 
+// we trust the zlib path is given as a -I option.
+#if defined(__WXMSW__) && !defined(__WX_SETUP_H__)
+   #include "..\zlib\zlib.h"
+#else
+   #include "zlib.h"
+#endif
 
 #define ZSTREAM_BUFFER_SIZE 1024