diff options
| author | Jack Palevich <jackpal@google.com> | 2009-08-18 12:10:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-18 12:10:08 -0700 |
| commit | 1a2d2faa29b8d2ca981ec4f1ccc5d48d24e638cc (patch) | |
| tree | 06f724c292fd7048d8b7def36c821ac636b45edc | |
| parent | 88dc59ae382c28d077328d4a210bcbd1f5e1e5db (diff) | |
| parent | f4c575025539df7a22801394dac8ef1af891a8ff (diff) | |
| download | external_webkit-1a2d2faa29b8d2ca981ec4f1ccc5d48d24e638cc.zip external_webkit-1a2d2faa29b8d2ca981ec4f1ccc5d48d24e638cc.tar.gz external_webkit-1a2d2faa29b8d2ca981ec4f1ccc5d48d24e638cc.tar.bz2 | |
am f4c57502: am d2b4b46e: Merge change 21746 into eclair
Merge commit 'f4c575025539df7a22801394dac8ef1af891a8ff'
* commit 'f4c575025539df7a22801394dac8ef1af891a8ff':
Fix errors when compiled under g++ 4.4.1 on Ubuntu 9.10a4
| -rw-r--r-- | WebKitTools/android/webkitmerge/webkitmerge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKitTools/android/webkitmerge/webkitmerge.cpp b/WebKitTools/android/webkitmerge/webkitmerge.cpp index c769f5a..22eeb54 100644 --- a/WebKitTools/android/webkitmerge/webkitmerge.cpp +++ b/WebKitTools/android/webkitmerge/webkitmerge.cpp @@ -1159,7 +1159,7 @@ void CompareDirs(const char* workingDir, bool renamePass) workingDir, oldFile); if (sandOrder < 0 && renamePass == false) { // file added by android -- should always have name 'android?' - char* android = strstr(sandFile, "ndroid"); + const char* android = strstr(sandFile, "ndroid"); if (android == NULL) fprintf(stderr, "warning: expect added %s to contain 'android': %s/%s\n", sandDir ? "directory" : "file" , workingDir, sandFile); @@ -1202,7 +1202,7 @@ void CompareDirs(const char* workingDir, bool renamePass) if (iter != renameMap.end()) { string newName = renameMap[rename]; renamedDir = newName.c_str(); - char* renamed = strrchr(renamedDir, '/'); + char* renamed = (char*) strrchr(renamedDir, '/'); *renamed++ = '\0'; // splits rename into two strings if (options.emitPerforceCommands) { fprintf(commandFile, "p4 integrate \"%s/%s/%s\" \"%s/%s/%s\"\n", sandboxCmd, workingDir, oldFile, |