summaryrefslogtreecommitdiffstats
path: root/courgette/ensemble_apply.cc
diff options
context:
space:
mode:
authorsra@google.com <sra@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-18 03:28:40 +0000
committersra@google.com <sra@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-18 03:28:40 +0000
commit54f1b829fe53c48b82440e7c8482e2b6ca397995 (patch)
tree5600358a8d8fac77ea4a7730fca9c4b6cbe09108 /courgette/ensemble_apply.cc
parent4efe77c3fd39df0dc03b0d73ca0ba24c6e66ff28 (diff)
downloadchromium_src-54f1b829fe53c48b82440e7c8482e2b6ca397995.zip
chromium_src-54f1b829fe53c48b82440e7c8482e2b6ca397995.tar.gz
chromium_src-54f1b829fe53c48b82440e7c8482e2b6ca397995.tar.bz2
Code changes to get the code to compile under GCC.
Courgette still only knows how to compress Windows x86 executables. But now you can compress them on linux. BUG=none TEST=none Review URL: http://codereview.chromium.org/149597 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'courgette/ensemble_apply.cc')
-rw-r--r--courgette/ensemble_apply.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/courgette/ensemble_apply.cc b/courgette/ensemble_apply.cc
index 5a9edfd4..7ab6ff1 100644
--- a/courgette/ensemble_apply.cc
+++ b/courgette/ensemble_apply.cc
@@ -351,9 +351,9 @@ Status ApplyEnsemblePatch(SourceStream* base,
return C_OK;
}
-Status ApplyEnsemblePatch(const wchar_t* old_file_name,
- const wchar_t* patch_file_name,
- const wchar_t* new_file_name) {
+Status ApplyEnsemblePatch(const FilePath::CharType* old_file_name,
+ const FilePath::CharType* patch_file_name,
+ const FilePath::CharType* new_file_name) {
Status status;
// First read enough of the patch file to validate the header is well-formed.
@@ -403,7 +403,7 @@ Status ApplyEnsemblePatch(const wchar_t* old_file_name,
new_sink_stream.Length());
if (written == -1)
return C_WRITE_OPEN_ERROR;
- if (written != new_sink_stream.Length())
+ if (static_cast<size_t>(written) != new_sink_stream.Length())
return C_WRITE_ERROR;
return C_OK;