зеркало из https://github.com/mozilla/pjs.git
Fixing mingw bustage
This commit is contained in:
Родитель
4296fca358
Коммит
2992cc7bc2
|
@ -102,9 +102,9 @@ EXTRA_DSO_LDOPTS += -lbe
|
|||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
EXTRA_DSO_LDOPTS += shell32.lib ole32.lib
|
||||
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, shell32 ole32)
|
||||
ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
|
||||
EXTRA_DSO_LDOPTS += imagehlp.lib
|
||||
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, imagehlp)
|
||||
endif
|
||||
endif # WINNT
|
||||
|
||||
|
|
|
@ -301,7 +301,7 @@ PRBool nsFileSpec::IsSymlink() const
|
|||
|
||||
if (SUCCEEDED(hres))
|
||||
{
|
||||
WORD wsz[MAX_PATH];
|
||||
WCHAR wsz[MAX_PATH];
|
||||
// Ensure that the string is Unicode.
|
||||
MultiByteToWideChar(CP_ACP, 0, mPath, -1, wsz, MAX_PATH);
|
||||
|
||||
|
@ -352,7 +352,7 @@ nsresult nsFileSpec::ResolveSymlink(PRBool& wasSymlink)
|
|||
|
||||
if (SUCCEEDED(hres))
|
||||
{
|
||||
WORD wsz[MAX_PATH];
|
||||
WCHAR wsz[MAX_PATH];
|
||||
// Ensure that the string is Unicode.
|
||||
MultiByteToWideChar(CP_ACP, 0, mPath, -1, wsz, MAX_PATH);
|
||||
|
||||
|
|
|
@ -102,9 +102,9 @@ EXTRA_DSO_LDOPTS += -lbe
|
|||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
EXTRA_DSO_LDOPTS += shell32.lib ole32.lib
|
||||
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, shell32 ole32)
|
||||
ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
|
||||
EXTRA_DSO_LDOPTS += imagehlp.lib
|
||||
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, imagehlp)
|
||||
endif
|
||||
endif # WINNT
|
||||
|
||||
|
|
|
@ -301,7 +301,7 @@ PRBool nsFileSpec::IsSymlink() const
|
|||
|
||||
if (SUCCEEDED(hres))
|
||||
{
|
||||
WORD wsz[MAX_PATH];
|
||||
WCHAR wsz[MAX_PATH];
|
||||
// Ensure that the string is Unicode.
|
||||
MultiByteToWideChar(CP_ACP, 0, mPath, -1, wsz, MAX_PATH);
|
||||
|
||||
|
@ -352,7 +352,7 @@ nsresult nsFileSpec::ResolveSymlink(PRBool& wasSymlink)
|
|||
|
||||
if (SUCCEEDED(hres))
|
||||
{
|
||||
WORD wsz[MAX_PATH];
|
||||
WCHAR wsz[MAX_PATH];
|
||||
// Ensure that the string is Unicode.
|
||||
MultiByteToWideChar(CP_ACP, 0, mPath, -1, wsz, MAX_PATH);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче