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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 506b03ffece1e7be9ceebe9652ba2cf52048f208..70456d0bd3bd0df1918542abcd454f0242c7788b 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -133,8 +133,15 @@
 #elif defined(__WATCOMC__)
     typedef unsigned int bool;
 #elif defined(__SUNCC__)
 #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__)
 #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 001e18d5930f5cb40d4b230e65be0b6dc217992c..85448991d261d53578654e17d27446d7c37be7f4 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -37,17 +37,6 @@
     #include "wx/utils.h"   // for copystring() (beurk...)
 #endif
 
     #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
 // =============================================================================
 // =============================================================================
 // implementation
 // =============================================================================