some very minor changes

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 110c18ae7ade03da370507b49129e967bcb802dc..cc731991c3bee92a08ab654dd06d0c913ece28d0 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -41,6 +41,14 @@
 #endif
 #endif
 
+#if defined(sun) || defined(__SUN__)
+# if !defined(__GNUG__)
+#  ifndef __SUNCC__
+#   define __SUNCC__
+#  endif
+# endif
+#endif
+
 // suppress some Visual C++ warnings
 #ifdef _MSC_VER
 #   pragma warning(disable:4244)    // cobversion from double to float
@@ -104,16 +112,19 @@
 // VC++ 4.0 is 1000.
 
 // Add more tests here for compilers that don't already define bool.
-#if defined(_MSC_VER) && (_MSC_VER <= 1000)
+#if defined( __MWERKS__ )
+    #if (__MWERKS__ < 0x1000) || !__option(bool)
+        typedef unsigned int bool;
+    #endif
+#elif defined(_MSC_VER) && (_MSC_VER <= 1000)
     typedef unsigned int bool;
 #elif defined(_MSC_VER) && (_MSC_VER == 1020)
     #define bool unsigned int
 #elif defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
     typedef unsigned int bool;
-#elif defined(__MWERKS__) 
-    #if (__MWERKS__ < 0x1000) || !__option(bool)
-        typedef unsigned int bool;
-    #endif
+#elif defined(__SUNCC__)
+    // If we use int, we get identically overloaded functions in config.cpp
+    typedef unsigned char bool;
 #endif
 
 #if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__)