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

Macros for simplified testing Open Watcom version and required tweaks.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-11-10 16:16:05 +00:00
parent 2a2d7a737d
commit 6d3d756a6a
11 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/imagjpeg.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: imagjpeg.cpp
// Name: src/common/imagjpeg.cpp
// Purpose: wxImage JPEG handler
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -29,7 +29,7 @@
// 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.
#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__DIGITALMARS__) || (defined(__WATCOMC__) && __WATCOMC__ < 1200))
#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__DIGITALMARS__))
#define HAVE_BOOLEAN
#include "wx/msw/wrapwin.h"
#endif
@@ -420,9 +420,3 @@ bool wxJPEGHandler::DoCanRead( wxInputStream& stream )
#endif // wxUSE_STREAMS
#endif // wxUSE_LIBJPEG