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
This commit is contained in:
@@ -28,8 +28,6 @@ $Id$
|
|||||||
// the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here
|
// 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)
|
#if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
|
||||||
#include "../zlib/zlib.h"
|
#include "../zlib/zlib.h"
|
||||||
#elif defined(__WXMAC__) && defined(__UNIX__)
|
|
||||||
#include <Kernel/net/zlib.h>
|
|
||||||
#else
|
#else
|
||||||
#include "zlib.h"
|
#include "zlib.h"
|
||||||
#endif
|
#endif
|
||||||
|
@@ -60,8 +60,6 @@ extern "C" {
|
|||||||
// the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here
|
// 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)
|
#if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
|
||||||
#include "../zlib/zlib.h"
|
#include "../zlib/zlib.h"
|
||||||
#elif defined(__WXMAC__) && defined(__UNIX__)
|
|
||||||
#include <Kernel/net/zlib.h>
|
|
||||||
#else
|
#else
|
||||||
#include "zlib.h"
|
#include "zlib.h"
|
||||||
#endif
|
#endif
|
||||||
|
@@ -33,8 +33,6 @@
|
|||||||
// the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here
|
// 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)
|
#if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
|
||||||
#include "../zlib/zlib.h"
|
#include "../zlib/zlib.h"
|
||||||
#elif defined(__WXMAC__) && defined(__UNIX__)
|
|
||||||
#include <Kernel/net/zlib.h>
|
|
||||||
#else
|
#else
|
||||||
#include "zlib.h"
|
#include "zlib.h"
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user