From 8cbc39e803460d493c2783c4474123a3b1817c03 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Thu, 4 Oct 2001 21:39:06 +0000 Subject: [PATCH] use wxWindows zlib.h instead of Mac OS X system zlib.h directly git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/unzip.c | 2 -- src/common/unzip.h | 2 -- src/common/zstream.cpp | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/common/unzip.c b/src/common/unzip.c index 7b1369e5aa..23a622b4f5 100644 --- a/src/common/unzip.c +++ b/src/common/unzip.c @@ -28,8 +28,6 @@ $Id$ // the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here #if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH) #include "../zlib/zlib.h" -#elif defined(__WXMAC__) && defined(__UNIX__) - #include #else #include "zlib.h" #endif diff --git a/src/common/unzip.h b/src/common/unzip.h index 024e3d9cd6..78dee0ee4d 100644 --- a/src/common/unzip.h +++ b/src/common/unzip.h @@ -60,8 +60,6 @@ extern "C" { // the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here #if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH) #include "../zlib/zlib.h" -#elif defined(__WXMAC__) && defined(__UNIX__) - #include #else #include "zlib.h" #endif diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index 2cfec91082..2636efd14b 100644 --- a/src/common/zstream.cpp +++ b/src/common/zstream.cpp @@ -33,8 +33,6 @@ // the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here #if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH) #include "../zlib/zlib.h" -#elif defined(__WXMAC__) && defined(__UNIX__) - #include #else #include "zlib.h" #endif -- 2.47.2