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

compilation fix for Watcom

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2001-12-08 23:25:35 +00:00
parent d4597e138e
commit cb69afe081
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/imagjpeg.cpp
View File

@ -27,10 +27,25 @@
#include "wx/debug.h"
#include "wx/log.h"
#include "wx/app.h"
// NB: Some compilers define boolean type in Windows headers (e.g. Watcom C++).
// 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
// defining HAVE_BOOLEAN.
//
// TODO: include windows.h for MetroWerks and Watcom only after 2.3.2 release!
#if defined(__WXMSW__)
#if defined(__MWERKS__) || defined(__WATCOMC__)
#define HAVE_BOOLEAN
#endif
#include <windows.h>
#endif // __WXMSW__
extern "C"
{
#include "jpeglib.h"
}
#include "wx/filefn.h"
#include "wx/wfstream.h"
#include "wx/intl.h"
@ -47,10 +62,6 @@ extern "C"
#endif
#endif
#ifdef __WXMSW__
#include <windows.h>
#endif
//-----------------------------------------------------------------------------
// wxJPEGHandler
//-----------------------------------------------------------------------------