зеркало из https://github.com/mozilla/pjs.git
Fix rasdlg on MingW builds. Bug 203300, patch by jonwil@tpgi.com.au (Jonathan
Wilson), r=darin, sr=bzbarsky, a=sspitzer
This commit is contained in:
Родитель
c2d053ca25
Коммит
68786e981e
|
@ -75,9 +75,7 @@ else
|
||||||
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
||||||
CPPSRCS += nsURLHelperWin.cpp
|
CPPSRCS += nsURLHelperWin.cpp
|
||||||
CPPSRCS += nsNativeConnectionHelper.cpp
|
CPPSRCS += nsNativeConnectionHelper.cpp
|
||||||
ifndef GNU_CC
|
|
||||||
CPPSRCS += nsAutodialWin.cpp
|
CPPSRCS += nsAutodialWin.cpp
|
||||||
endif
|
|
||||||
else
|
else
|
||||||
CPPSRCS += nsURLHelperUnix.cpp
|
CPPSRCS += nsURLHelperUnix.cpp
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -37,9 +37,7 @@
|
||||||
* ***** END LICENSE BLOCK ***** */
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
#include "nsNativeConnectionHelper.h"
|
#include "nsNativeConnectionHelper.h"
|
||||||
#ifndef __MINGW32__
|
|
||||||
#include "nsAutodialWin.h"
|
#include "nsAutodialWin.h"
|
||||||
#endif
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// API typically invoked on the socket transport thread
|
// API typically invoked on the socket transport thread
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
@ -48,12 +46,10 @@
|
||||||
PRBool
|
PRBool
|
||||||
nsNativeConnectionHelper::OnConnectionFailed(const char* hostName)
|
nsNativeConnectionHelper::OnConnectionFailed(const char* hostName)
|
||||||
{
|
{
|
||||||
#ifndef __MINGW32__
|
|
||||||
nsRASAutodial autodial;
|
nsRASAutodial autodial;
|
||||||
|
|
||||||
if (autodial.ShouldDialOnNetworkError())
|
if (autodial.ShouldDialOnNetworkError())
|
||||||
return NS_SUCCEEDED(autodial.DialDefault(hostName));
|
return NS_SUCCEEDED(autodial.DialDefault(hostName));
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
return PR_FALSE;
|
return PR_FALSE;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче