access TLS cache variable directly and not via a helper function when using compiler...

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

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index bc472331c9917de8d8a27d3195bc5412b022670d..5facf0db698faba98194c2f643e2778bc8911df3 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
@@ -68,6 +64,7 @@ public:
   virtual bool IsLocalHost() const = 0;
 
   virtual bool AnyAddress() = 0;
+  virtual bool BroadcastAddress() = 0;
 
   virtual wxString IPAddress() const = 0;
 
@@ -97,6 +94,8 @@ public:
 
   // any (0.0.0.0)
   virtual bool AnyAddress();
+  // all (255.255.255.255)
+  virtual bool BroadcastAddress();
 
   virtual wxString Hostname() const;
   wxString OrigHostname() { return m_origHostname; }
@@ -107,22 +106,25 @@ 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:
-//
-// IPV6 has not yet been implemented in socket layer
 class WXDLLIMPEXP_NET wxIPV6address : public wxIPaddress {
   DECLARE_DYNAMIC_CLASS(wxIPV6address)
 private:
-  struct sockaddr_in6 *m_addr;
+  wxString m_origHostname;
 public:
   wxIPV6address();
   wxIPV6address(const wxIPV6address& other);
@@ -131,8 +133,8 @@ public:
   // IPV6 name formats
   //
   //                          hostname
-  //                          3ffe:ffff:0100:f101:0210:a4ff:fee3:9566 
-  // compact (base85)         Itu&-ZQ82s>J%s99FJXT
+  //                          3ffe:ffff:0100:f101:0210:a4ff:fee3:9566
+  // compact (base85)         Itu&-ZQ82s>J%s99FJXT (depends on platform api)
   // compressed format        ::1
   // ipv4 mapped              ::ffff:1.2.3.4
   virtual bool Hostname(const wxString& name);
@@ -147,8 +149,10 @@ public:
 
   // any (0000:0000:0000:0000:0000:0000:0000:0000 (::))
   virtual bool AnyAddress();
+  // all (?)
+  virtual bool BroadcastAddress();
 
-  // 3ffe:ffff:0100:f101:0210:a4ff:fee3:9566 
+  // 3ffe:ffff:0100:f101:0210:a4ff:fee3:9566
   virtual wxString IPAddress() const;
 
   virtual wxString Hostname() const;
@@ -160,7 +164,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>