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

Unified Diff: base/process/memory.h

Issue 1531443002: Update base to extend NaCl support (needed for skia support) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years 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: base/process/memory.h
diff --git a/base/process/memory.h b/base/process/memory.h
index da27151d1b1b31b3500bf0c59151d702c2a2c61e..33dd252f901699bbae62b97b5c96270c6c4e44ef 100644
--- a/base/process/memory.h
+++ b/base/process/memory.h
@@ -49,7 +49,7 @@ BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size);
BASE_EXPORT HMODULE GetModuleFromAddress(void* address);
#endif
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL)
Mark Seaborn 2015/12/15 18:51:35 Hmm, AdjustOOMScore() is a Linuxism. We don't hav
Sean Klein 2015/12/15 19:29:26 I think this was a leftover from a linking error,
BASE_EXPORT extern size_t g_oom_size;
// The maximum allowed value for the OOM score.
« base/memory/BUILD.gn ('K') | « base/process/BUILD.gn ('k') | base/process/memory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698