diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-18 11:30:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-18 11:30:00 -0700 |
| commit | d2b4b46e864b9002fee625c0a6c65955e4f4d92c (patch) | |
| tree | 06f724c292fd7048d8b7def36c821ac636b45edc | |
| parent | 14b66f1be3bd17e6c607bad649e68330489869a7 (diff) | |
| parent | 632ca4c55226c689de2194b3291897784df6070e (diff) | |
| download | external_webkit-d2b4b46e864b9002fee625c0a6c65955e4f4d92c.zip external_webkit-d2b4b46e864b9002fee625c0a6c65955e4f4d92c.tar.gz external_webkit-d2b4b46e864b9002fee625c0a6c65955e4f4d92c.tar.bz2 | |
Merge change 21746 into eclair
* changes:
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, |