From 6c82a1fd8d02beb023b21d230b97ddce42962b02 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 20 Jan 1999 18:59:20 +0000 Subject: [PATCH] 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 --- include/wx/defs.h | 11 +++++++++-- src/common/list.cpp | 11 ----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 506b03ffec..70456d0bd3 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -133,8 +133,15 @@ #elif defined(__WATCOMC__) typedef unsigned int bool; #elif defined(__SUNCC__) - // If we use int, we get identically overloaded functions in config.cpp - typedef unsigned char bool; + #ifdef __SUNPRO_C + // 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 #if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__)) || defined(__SC__) || defined(__SALFORDC__) diff --git a/src/common/list.cpp b/src/common/list.cpp index 001e18d593..85448991d2 100644 --- a/src/common/list.cpp +++ b/src/common/list.cpp @@ -37,17 +37,6 @@ #include "wx/utils.h" // for copystring() (beurk...) #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 // ============================================================================= -- 2.45.2