X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7172db18572590af6b79492bcabe284de33bd090..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/private/sckaddr.h?ds=inline

diff --git a/include/wx/private/sckaddr.h b/include/wx/private/sckaddr.h
index a4971fd4aa..ba2063ed9e 100644
--- a/include/wx/private/sckaddr.h
+++ b/include/wx/private/sckaddr.h
@@ -1,9 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/sockaddr.h
+// Name:        wx/private/sckaddr.h
 // Purpose:     wxSockAddressImpl
 // Author:      Vadim Zeitlin
 // Created:     2008-12-28
-// RCS-ID:      $Id$
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -11,7 +10,7 @@
 #ifndef _WX_PRIVATE_SOCKADDR_H_
 #define _WX_PRIVATE_SOCKADDR_H_
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     #include "wx/msw/wrapwin.h"
 
     #if wxUSE_IPV6
@@ -137,10 +136,11 @@ public:
 
     wxSockAddressImpl& operator=(const wxSockAddressImpl& other)
     {
-        free(m_addr);
-
-        InitFromOther(other);
-
+        if (this != &other)
+        {
+            free(m_addr);
+            InitFromOther(other);
+        }
         return *this;
     }
 
@@ -178,13 +178,13 @@ public:
             case FAMILY_INET6:
                 CreateINET6();
                 break;
-#endif
+#endif // wxUSE_IPV6
 
 #ifdef wxHAS_UNIX_DOMAIN_SOCKETS
             case FAMILY_UNIX:
-#endif
                 CreateUnix();
                 break;
+#endif // wxHAS_UNIX_DOMAIN_SOCKETS
 
             default:
                 wxFAIL_MSG( "unsupported socket address family" );