projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not reintroduce #pragma interface/implementation for html/helpdlg and mediactrl...
[wxWidgets.git]
/
include
/
wx
/
sckaddr.h
diff --git
a/include/wx/sckaddr.h
b/include/wx/sckaddr.h
index b0bc278ffe853e2e37659e129018b6a197d2217b..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
#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
@@
-108,12
+104,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:
@@
-160,7
+162,7
@@
public:
#endif // wxUSE_IPV6
#endif // wxUSE_IPV6
-#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) && !defined(__
CYGWIN
__)
+#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>