Fix AdjustForOverflow to use item->CalcMin, not item->GetSize

[wxWidgets.git] / src / common / sckaddr.cpp

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index d7da5b72bc7282c6b489ca6aa175ba340e945ca6..dd801147b3165a2bf3ca4ecf562160b251672a74 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -27,7 +27,7 @@
     #include <stdlib.h>
     #include <ctype.h>
 
-    #if !defined(__MWERKS__) && !defined(__SALFORDC__)
+    #if !defined(__MWERKS__)
         #include <memory.h>
     #endif
 #endif // !WX_PRECOMP
@@ -42,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxIPaddress)
 #if wxUSE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress)
 #endif
-#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) 
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
@@ -369,7 +369,7 @@ unsigned short wxIPV6address::Service() const
 
 #endif // wxUSE_IPV6
 
-#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) 
 
 // ---------------------------------------------------------------------------
 // wxUNIXaddress