fixes for Sun CC 5.0 (unlike 4.2 it understands bool)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -133,8 +133,15 @@
|
|||||||
#elif defined(__WATCOMC__)
|
#elif defined(__WATCOMC__)
|
||||||
typedef unsigned int bool;
|
typedef unsigned int bool;
|
||||||
#elif defined(__SUNCC__)
|
#elif defined(__SUNCC__)
|
||||||
// If we use int, we get identically overloaded functions in config.cpp
|
#ifdef __SUNPRO_C
|
||||||
typedef unsigned char bool;
|
// starting from version 5.0 Sun CC understands 'bool'
|
||||||
|
#if __SUNPRO_C <= 0x0420
|
||||||
|
// If we use int, we get identically overloaded functions in config.cpp
|
||||||
|
typedef unsigned char bool;
|
||||||
|
#endif // Sun CC version
|
||||||
|
#else
|
||||||
|
#error "Unknown compiler: only Sun's CC and gcc are currently reckognized."
|
||||||
|
#endif // Sun CC
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__)) || defined(__SC__) || defined(__SALFORDC__)
|
#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__)) || defined(__SC__) || defined(__SALFORDC__)
|
||||||
|
@@ -37,17 +37,6 @@
|
|||||||
#include "wx/utils.h" // for copystring() (beurk...)
|
#include "wx/utils.h" // for copystring() (beurk...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Sun CC compatibility (interference with xview/pkg.h, apparently...)
|
|
||||||
// But XView is no longer supported.
|
|
||||||
/*
|
|
||||||
#if defined (SUN_CC) || defined(__SUNCC__) && defined(__XVIEW__)
|
|
||||||
#undef va_start
|
|
||||||
#undef va_end
|
|
||||||
#undef va_arg
|
|
||||||
#undef va_list
|
|
||||||
#endif
|
|
||||||
*/
|
|
||||||
|
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
// implementation
|
// implementation
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
|
Reference in New Issue
Block a user