blind fix for latest mingw32 3.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -350,7 +350,7 @@ wxDialUpManagerMSW::wxDialUpManagerMSW()
|
|||||||
{
|
{
|
||||||
wxLogError(_("Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."));
|
wxLogError(_("Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."));
|
||||||
}
|
}
|
||||||
else if( ms_pfnRasDial == 0 )
|
else if ( !ms_pfnRasDial )
|
||||||
{
|
{
|
||||||
// resolve the functions we need
|
// resolve the functions we need
|
||||||
|
|
||||||
@@ -830,12 +830,12 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
|
|||||||
|
|
||||||
DWORD dwRet = ms_pfnRasDial
|
DWORD dwRet = ms_pfnRasDial
|
||||||
(
|
(
|
||||||
(LPRASDIALEXTENSIONS)NULL, // no extended features
|
NULL, // no extended features
|
||||||
NULL, // default phone book file (NT only)
|
NULL, // default phone book file (NT only)
|
||||||
&rasDialParams,
|
&rasDialParams,
|
||||||
0, // use callback for notifications
|
0, // use callback for notifications
|
||||||
async ? wxRasDialFunc // the callback
|
async ? (void *)wxRasDialFunc // cast needed for gcc 3.1
|
||||||
: 0, // no notifications - sync operation
|
: 0, // no notifications, sync operation
|
||||||
&ms_hRasConnection
|
&ms_hRasConnection
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -1277,8 +1277,7 @@ static void WINAPI wxRasDialFunc(UINT unMsg,
|
|||||||
rasconnstate, dwError);
|
rasconnstate, dwError);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif // __BORLANDC__
|
||||||
// __BORLANDC__
|
|
||||||
#endif // wxUSE_DIALUP_MANAGER
|
#endif // wxUSE_DIALUP_MANAGER
|
||||||
|
|
||||||
// vi:sts=4:sw=4:et
|
|
||||||
|
Reference in New Issue
Block a user