mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 21:35:39 +00:00
Merge
This commit is contained in:
commit
d278ec7a0f
@ -51,7 +51,7 @@ VISIBILITY_FLAGS =
|
|||||||
HOST_PROGRAM = nsinstall$(HOST_BIN_SUFFIX)
|
HOST_PROGRAM = nsinstall$(HOST_BIN_SUFFIX)
|
||||||
|
|
||||||
ifeq (WINNT,$(HOST_OS_ARCH))
|
ifeq (WINNT,$(HOST_OS_ARCH))
|
||||||
HOST_CSRCS = nsinstall_win.c
|
HOST_CSRCS = nsinstall_win.c
|
||||||
HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
|
HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
|
||||||
else
|
else
|
||||||
HOST_CSRCS = nsinstall.c pathsub.c
|
HOST_CSRCS = nsinstall.c pathsub.c
|
||||||
|
@ -51,8 +51,7 @@ VISIBILITY_FLAGS =
|
|||||||
HOST_PROGRAM = nsinstall$(HOST_BIN_SUFFIX)
|
HOST_PROGRAM = nsinstall$(HOST_BIN_SUFFIX)
|
||||||
|
|
||||||
ifeq (WINNT,$(HOST_OS_ARCH))
|
ifeq (WINNT,$(HOST_OS_ARCH))
|
||||||
HOST_CSRCS = nsinstall_win.c
|
HOST_CSRCS = nsinstall_win.c
|
||||||
HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
|
|
||||||
else
|
else
|
||||||
HOST_CSRCS = nsinstall.c pathsub.c
|
HOST_CSRCS = nsinstall.c pathsub.c
|
||||||
endif
|
endif
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <shlwapi.h>
|
|
||||||
#pragma hdrstop
|
#pragma hdrstop
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -333,8 +332,6 @@ sh_DoCopy(wchar_t *srcFileName,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!CopyFile(longSrc, longDst, FALSE)) {
|
if (!CopyFile(longSrc, longDst, FALSE)) {
|
||||||
if (!wcscmp(PathFindExtension(longSrc), L".chk"))
|
|
||||||
return TRUE; // Incredibly ugly hack to work around Bug 539689
|
|
||||||
fprintf(stderr, "nsinstall: cannot copy %ls to %ls: %s\n",
|
fprintf(stderr, "nsinstall: cannot copy %ls to %ls: %s\n",
|
||||||
srcFileName, dstFileName, sh_GetLastErrorMessage());
|
srcFileName, dstFileName, sh_GetLastErrorMessage());
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
Loading…
Reference in New Issue
Block a user