don't include windows.h unless neccessary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -32,14 +32,10 @@
|
|||||||
// This causes a conflict with jmorecfg.h header from libjpeg, so we have
|
// This causes a conflict with jmorecfg.h header from libjpeg, so we have
|
||||||
// to make sure libjpeg won't try to define boolean itself. This is done by
|
// to make sure libjpeg won't try to define boolean itself. This is done by
|
||||||
// defining HAVE_BOOLEAN.
|
// defining HAVE_BOOLEAN.
|
||||||
//
|
#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__WATCOMC__))
|
||||||
// TODO: include windows.h for MetroWerks and Watcom only after 2.3.2 release!
|
#define HAVE_BOOLEAN
|
||||||
#if defined(__WXMSW__)
|
|
||||||
#if defined(__MWERKS__) || defined(__WATCOMC__)
|
|
||||||
#define HAVE_BOOLEAN
|
|
||||||
#endif
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif // __WXMSW__
|
#endif
|
||||||
|
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user