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

Now uses #define __WX_SETUP_H__ to signify that we're using configure

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Harco de Hilster
1999-07-18 00:07:32 +00:00
parent 0c07f09eab
commit bfcc7d7fd0
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acconfig.h
View File

@@ -2,8 +2,10 @@
/* */ /* */
/* Version: $Id$ */ /* Version: $Id$ */
#ifndef __GTKSETUPH__ /* This define (__WX_SETUP_H__) is used both to insure setup.h is included
#define __GTKSETUPH__ * only once and to indicate that we are building using configure. */
#ifndef __WX_SETUP_H__
#define __WX_SETUP_H__
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface #pragma interface
@@ -611,4 +613,4 @@
@BOTTOM@ @BOTTOM@
#endif /* __GTKSETUPH__ */ #endif /* __WX_SETUP_H__ */

6
src/common/zstream.cpp
View File

@@ -29,9 +29,9 @@
// When using configure, the path must be "zlib.h" I don't know // When using configure, the path must be "zlib.h" I don't know
// what other ports (wxMac, wxMotif without configure) need here. // what other ports (wxMac, wxMotif without configure) need here.
// If we are building with ./configure, we trust the zlib path is // If we are building with configure (defines __WX_SETUP_H__),
// given as a -I option. (confusingly configure defines __GTKSETUPH__) // we trust the zlib path is given as a -I option.
#if defined(__WXMSW__) && !defined(__GTKSETUPH__) #if defined(__WXMSW__) && !defined(__WX_SETUP_H__)
#include "..\zlib\zlib.h" #include "..\zlib\zlib.h"
#else #else
#include "zlib.h" #include "zlib.h"