Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Kyle Huey 2011-03-19 07:59:11 -04:00
commit d278ec7a0f
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/Makefile.in
View File

@ -51,7 +51,7 @@ VISIBILITY_FLAGS =
HOST_PROGRAM = nsinstall$(HOST_BIN_SUFFIX)
ifeq (WINNT,$(HOST_OS_ARCH))
HOST_CSRCS = nsinstall_win.c
HOST_CSRCS = nsinstall_win.c
HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
else
HOST_CSRCS = nsinstall.c pathsub.c

3
js/src/config/Makefile.in
View File

@ -51,8 +51,7 @@ VISIBILITY_FLAGS =
HOST_PROGRAM = nsinstall$(HOST_BIN_SUFFIX)
ifeq (WINNT,$(HOST_OS_ARCH))
HOST_CSRCS = nsinstall_win.c
HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
HOST_CSRCS = nsinstall_win.c
else
HOST_CSRCS = nsinstall.c pathsub.c
endif

3
js/src/config/nsinstall_win.c
View File

@ -11,7 +11,6 @@
#include <string.h>
#include <assert.h>
#include <windows.h>
#include <shlwapi.h>
#pragma hdrstop
/*
@ -333,8 +332,6 @@ sh_DoCopy(wchar_t *srcFileName,
}
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",
srcFileName, dstFileName, sh_GetLastErrorMessage());
return FALSE;