Remove BCC-specific conditionally compiled code
This commit is contained in:
@@ -82,7 +82,6 @@
|
||||
define it ourselves if any of the following macros is defined:
|
||||
|
||||
- MSVC _WIN32 (notice that this is also defined under Win64)
|
||||
- Borland __WIN32__
|
||||
- Our __WXMSW__ which selects Windows as platform automatically
|
||||
*/
|
||||
#if defined(_WIN32) || defined(__WIN32__) || defined(__WXMSW__)
|
||||
@@ -224,42 +223,6 @@
|
||||
#endif /* wxUSE_UNICODE */
|
||||
|
||||
|
||||
/*
|
||||
test for old versions of Borland C, normally need at least 5.82, Turbo
|
||||
explorer, available for free at http://www.turboexplorer.com/downloads
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
Older versions of Borland C have some compiler bugs that need
|
||||
workarounds. Mostly pertains to the free command line compiler 5.5.1.
|
||||
*/
|
||||
#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x551)
|
||||
/*
|
||||
The Borland free compiler is unable to handle overloaded enum
|
||||
comparisons under certain conditions e.g. when any class has a
|
||||
conversion ctor for an integral type and there's an overload to
|
||||
compare between an integral type and that class type.
|
||||
*/
|
||||
# define wxCOMPILER_NO_OVERLOAD_ON_ENUM
|
||||
|
||||
/*
|
||||
This is needed to overcome bugs in 5.5.1 STL, linking errors will
|
||||
result if it is not defined.
|
||||
*/
|
||||
# define _RWSTD_COMPILE_INSTANTIATE
|
||||
|
||||
/*
|
||||
Preprocessor in older Borland compilers have major problems
|
||||
concatenating with ##. Specifically, if the string operands being
|
||||
concatenated have special meaning (e.g. L"str", 123i64 etc)
|
||||
then ## will not concatenate the operands correctly.
|
||||
|
||||
As a workaround, define wxPREPEND* and wxAPPEND* without using
|
||||
wxCONCAT_HELPER.
|
||||
*/
|
||||
# define wxCOMPILER_BROKEN_CONCAT_OPER
|
||||
#endif /* __BORLANDC__ */
|
||||
|
||||
/*
|
||||
OS: then test for generic Unix defines, then for particular flavours and
|
||||
@@ -369,7 +332,7 @@
|
||||
# include "wx/msw/libraries.h"
|
||||
#endif
|
||||
|
||||
#if defined(__BORLANDC__) || (defined(__GNUC__) && __GNUC__ < 3)
|
||||
#if (defined(__GNUC__) && __GNUC__ < 3)
|
||||
#define wxNEEDS_CHARPP
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user