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

Adjustement to OW 1.6-rc2 state.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-11-07 14:51:52 +00:00
parent 3904a28098
commit e9c2213ed7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/imagjpeg.cpp
View File

@@ -27,11 +27,12 @@
#endif #endif
// NB: Some compilers define boolean type in Windows headers // NB: Some compilers define boolean type in Windows headers
// (e.g. Watcom C++, but not Open Watcom). // (e.g. Watcom C++, but not some Open Watcom versions).
// 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(__DIGITALMARS__)) #if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__DIGITALMARS__) || \
(defined(__WATCOMC__) && !wxONLY_WATCOM_EARLIER_THAN(1,6)))
#define HAVE_BOOLEAN #define HAVE_BOOLEAN
#include "wx/msw/wrapwin.h" #include "wx/msw/wrapwin.h"
#endif #endif