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

Unified Diff: base/process/memory.cc

Issue 2692273008: Hacky slashy (Closed)
Patch Set: rebase on config CL, and minor fixes Created 3 years, 7 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
« no previous file with comments | « base/process/launch_posix.cc ('k') | base/process/process_fuchsia.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/process/memory.cc
diff --git a/base/process/memory.cc b/base/process/memory.cc
index 6349c08ca0a78643753564943b15509717cb303a..1629b6b6799fe56818e3c5506738881d8d60c9e3 100644
--- a/base/process/memory.cc
+++ b/base/process/memory.cc
@@ -10,7 +10,7 @@
namespace base {
// Defined in memory_win.cc for Windows.
-#if !defined(OS_WIN)
+#if !defined(OS_WIN) && !defined(OS_FUCHSIA)
namespace {
@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) {
#endif
// Defined in memory_mac.mm for Mac.
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_FUCHSIA)
bool UncheckedCalloc(size_t num_items, size_t size, void** result) {
const size_t alloc_size = num_items * size;
« no previous file with comments | « base/process/launch_posix.cc ('k') | base/process/process_fuchsia.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698