Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

define OF() if not defined in the system headers, should help when using the system zlib version

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-09-18 15:39:28 +00:00
parent 32742e5755
commit 639cee3157
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/unzip.h
View File

@@ -52,17 +52,30 @@ $Id$
extern "C" {
#endif
/* include zlib.h if not done yet */
#ifndef _ZLIB_H
//#include "zlib.h"
// normally, the compiler options should contain -I../zlib, but it is
// apparently not the case for all MSW makefiles and so, unless we use
// configure (which defines __WX_SETUP_H__) or it is explicitly overridden by
// 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"
#else
#include "zlib.h"
#endif
/*
normally, the compiler options should contain -I../zlib, but it is
apparently not the case for all MSW makefiles and so, unless we use
configure (which defines __WX_SETUP_H__) or it is explicitly overridden
by 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"
# else
# include "zlib.h"
# endif
#endif /* _ZLIB_H */
/*
Some system zlib.h headers are modified to not define the OF() macro but use
the (standard) __P() instead (example: NetBSD 1.6), work around this if
needed assuming that we deal with an ANSI C compiler (which is a natural
assumption in 21st century!)
*/
#ifndef OF
# define OF(args) args
#endif
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)