Assorted fixes for 64-bit.

Review URL: http://codereview.chromium.org/160288


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21891 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 10 insertions, 9 deletions

diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc
index ef58e88..a59e8ab 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.cc
+++ b/chrome/browser/gtk/bookmark_manager_gtk.cc
@@ -1273,7 +1273,7 @@ void BookmarkManagerGtk::OnExportItemActivated(GtkMenuItem* menuitem,
 
 void BookmarkManagerGtk::FileSelected(const FilePath& path,
                                       int index, void* params) {
-  int id = reinterpret_cast<int>(params);
+  int id = reinterpret_cast<intptr_t>(params);
   if (id == IDS_BOOKMARK_MANAGER_IMPORT_MENU) {
     // ImporterHost is ref counted and will delete itself when done.
     ImporterHost* host = new ImporterHost();
diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc
index 9826110..f1b8f9a 100644
--- a/chrome/browser/gtk/menu_gtk.cc
+++ b/chrome/browser/gtk/menu_gtk.cc
@@ -233,8 +233,8 @@ void MenuGtk::OnMenuItemActivated(GtkMenuItem* menuitem, MenuGtk* menu) {
     if (data) {
       id = data->id;
     } else {
-      id = reinterpret_cast<int>(g_object_get_data(G_OBJECT(menuitem),
-                                                   "menu-id"));
+      id = reinterpret_cast<intptr_t>(g_object_get_data(G_OBJECT(menuitem),
+                                                        "menu-id"));
     }
 
     // The menu item can still be activated by hotkeys even if it is disabled.
@@ -309,8 +309,8 @@ void MenuGtk::SetMenuItemInfo(GtkWidget* widget, gpointer userdata) {
   if (data) {
     id = data->id;
   } else {
-    id = reinterpret_cast<int>(
-        g_object_get_data(G_OBJECT(widget), "menu-id"));
+    id = reinterpret_cast<intptr_t>(g_object_get_data(G_OBJECT(widget),
+                                    "menu-id"));
   }
 
   if (GTK_IS_CHECK_MENU_ITEM(widget)) {
diff --git a/chrome/browser/history/snippet.cc b/chrome/browser/history/snippet.cc
index 10e1481..c55761d 100644
--- a/chrome/browser/history/snippet.cc
+++ b/chrome/browser/history/snippet.cc
@@ -150,8 +150,9 @@ bool IsNextMatchWithinSnippetWindow(BreakIterator* bi,
   // heuristics to speed things up if necessary, but it's not likely that
   // we need to bother.
   bi->next(kSnippetContext);
-  int64_t current = bi->current();
-  return (next_match_start < current || current == BreakIterator::DONE);
+  int64 current = bi->current();
+  return (next_match_start < static_cast<uint64>(current) ||
+          current == BreakIterator::DONE);
 }
 
 }  // namespace
diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc
index 7c50e148..a163550 100644
--- a/chrome/browser/zygote_main_linux.cc
+++ b/chrome/browser/zygote_main_linux.cc
@@ -318,7 +318,7 @@ static bool MaybeEnterChroot() {
     const char* locale = setlocale(LC_ALL, "");
     LOG_IF(WARNING, locale == NULL) << "setlocale failed.";
 
-#if defined(ARCH_CPU_X86_FAMILY)
+#if defined(ARCH_CPU_X86)
     PATCH_GLOBAL_OFFSET_TABLE(localtime, sandbox_wrapper::localtime);
     PATCH_GLOBAL_OFFSET_TABLE(localtime_r, sandbox_wrapper::localtime_r);
 #endif
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index f14a4cf..c086d0d 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -51,7 +51,7 @@ bool RendererWebKitClientImpl::getFileSize(const WebString& path,
                                            long long& result) {
   if (RenderThread::current()->Send(new ViewHostMsg_GetFileSize(
       FilePath(webkit_glue::WebStringToFilePathString(path)),
-      &result))) {
+      reinterpret_cast<int64*>(&result)))) {
     return result >= 0;
   } else {
     result = -1;