don't crash if (char*)c_str() is used twice in a row on the same string and both...

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

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index 4f71207fd303cfc923a23d68fea81e8b65b1f2bd..98e1c0d4e7b592c28b91a963e91a8b2353737fee 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -12,10 +12,6 @@
 #ifndef _WX_NETWORK_ADDRESS_H
 #define _WX_NETWORK_ADDRESS_H
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "sckaddr.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_SOCKETS
@@ -108,12 +104,18 @@ public:
   virtual int Type() { return wxSockAddress::IPV4; }
   virtual wxSockAddress *Clone() const;
 
-  bool operator==(wxIPV4address& addr);
+  bool operator==(const wxIPV4address& addr) const;
 
 private:
   wxString m_origHostname;
 };
 
+
+// the IPv6 code probably doesn't work, untested -- set to 1 at your own risk
+#ifndef wxUSE_IPV6
+    #define wxUSE_IPV6 0
+#endif
+
 #if wxUSE_IPV6
 
 // Experimental Only:
@@ -160,7 +162,7 @@ public:
 
 #endif // wxUSE_IPV6
 
-#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) && !defined(__WXMSW__)
 #include <sys/socket.h>
 #ifndef __VMS__
 # include <sys/un.h>