Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compilation due to the fact that wx/socket.h no longer includes system socket headers and so AF_INET (which we don't need here in the first place) is not defined any more

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-30 00:07:48 +00:00
parent 07a9d3f946
commit 778f682e4d
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
samples/sockets/client.cpp
View File

@@ -77,7 +77,7 @@ public:
void OnOpenConnectionIPv6(wxCommandEvent& event); void OnOpenConnectionIPv6(wxCommandEvent& event);
#endif #endif
void OpenConnection(int family = AF_INET); void OpenConnection(wxSockAddress::Family family);
// event handlers for DatagramSocket menu (stub) // event handlers for DatagramSocket menu (stub)
void OnDatagram(wxCommandEvent& event); void OnDatagram(wxCommandEvent& event);
@@ -273,29 +273,28 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
{ {
OpenConnection(AF_INET); OpenConnection(wxSockAddress::IPV4);
} }
#if wxUSE_IPV6 #if wxUSE_IPV6
void MyFrame::OnOpenConnectionIPv6(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnOpenConnectionIPv6(wxCommandEvent& WXUNUSED(event))
{ {
OpenConnection(AF_INET6); OpenConnection(wxSockAddress::IPV6);
} }
#endif // wxUSE_IPV6 #endif // wxUSE_IPV6
void MyFrame::OpenConnection(int family) void MyFrame::OpenConnection(wxSockAddress::Family family)
{ {
wxUnusedVar(family); // unused in !wxUSE_IPV6 case
wxIPaddress * addr; wxIPaddress * addr;
wxIPV4address addr4; wxIPV4address addr4;
#if wxUSE_IPV6 #if wxUSE_IPV6
wxIPV6address addr6; wxIPV6address addr6;
if ( family==AF_INET6 ) if ( family == wxSockAddress::IPV6 )
addr = &addr6; addr = &addr6;
else else
addr = &addr4;
#else
wxUnusedVar(family);
addr = &addr4;
#endif #endif
addr = &addr4;
m_menuSocket->Enable(CLIENT_OPEN, false); m_menuSocket->Enable(CLIENT_OPEN, false);
#if wxUSE_IPV6 #if wxUSE_IPV6