Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(555)

Unified Diff: chrome/browser/zygote_main_linux.cc

Issue 160288: Assorted fixes for 64-bit. (Closed)
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/zygote_main_linux.cc
diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc
index 7c50e14858b230f78708bdc14a724a61e322eab3..a163550287bea0cb17c23fc243fb93d51987749d 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

Powered by Google App Engine
This is Rietveld 408576698