compilation

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

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index 4f71207fd303cfc923a23d68fea81e8b65b1f2bd..f24627bd5f17c638365b5589789054e7ec6c296c 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
 
 #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
 #include "wx/defs.h"
 
 #if wxUSE_SOCKETS


@@ -68,6 +64,7 @@ public:
   virtual bool IsLocalHost() const = 0;
 
   virtual bool AnyAddress() = 0;
   virtual bool IsLocalHost() const = 0;
 
   virtual bool AnyAddress() = 0;

+  virtual bool BroadcastAddress() = 0;

 
   virtual wxString IPAddress() const = 0;
 
 
   virtual wxString IPAddress() const = 0;
 


@@ -97,6 +94,8 @@ public:
 
   // any (0.0.0.0)
   virtual bool AnyAddress();
 
   // 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; }
 
   virtual wxString Hostname() const;
   wxString OrigHostname() { return m_origHostname; }


@@ -108,12 +107,18 @@ public:
   virtual int Type() { return wxSockAddress::IPV4; }
   virtual wxSockAddress *Clone() const;
 
   virtual int Type() { return wxSockAddress::IPV4; }
   virtual wxSockAddress *Clone() const;
 

-  bool operator==(wxIPV4address& addr);
+  bool operator==(const wxIPV4address& addr) const;

 
 private:
   wxString m_origHostname;
 };
 
 
 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:
 #if wxUSE_IPV6
 
 // Experimental Only:


@@ -147,6 +152,8 @@ public:
 
   // any (0000:0000:0000:0000:0000:0000:0000:0000 (::))
   virtual bool AnyAddress();
 
   // any (0000:0000:0000:0000:0000:0000:0000:0000 (::))
   virtual bool AnyAddress();

+  // all (?)
+  virtual bool BroadcastAddress();

 
   // 3ffe:ffff:0100:f101:0210:a4ff:fee3:9566
   virtual wxString IPAddress() const;
 
   // 3ffe:ffff:0100:f101:0210:a4ff:fee3:9566
   virtual wxString IPAddress() const;


@@ -160,7 +167,7 @@ public:
 
 #endif // wxUSE_IPV6
 
 
 #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>
 #include <sys/socket.h>
 #ifndef __VMS__
 # include <sys/un.h>