From 57c197ec1c3b9cd6bd00f2e541268106a1d0e4a1 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Mon, 18 Jan 2021 17:22:36 -0800
Subject: [PATCH] boot: update for new sf-semantics

---
 libraries/libvapours/include/vapours/util.hpp |  5 ++++-
 stratosphere/boot/source/boot_main.cpp        | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/libraries/libvapours/include/vapours/util.hpp b/libraries/libvapours/include/vapours/util.hpp
index 0a7702eda..70771d657 100644
--- a/libraries/libvapours/include/vapours/util.hpp
+++ b/libraries/libvapours/include/vapours/util.hpp
@@ -41,8 +41,11 @@
 #include <vapours/util/util_overlap.hpp>
 #include <vapours/util/util_string_util.hpp>
 #include <vapours/util/util_string_view.hpp>
-#include <vapours/util/util_mutex_utils.hpp>
 #include <vapours/util/util_variadic.hpp>
 #include <vapours/util/util_character_encoding.hpp>
 #include <vapours/util/util_format_string.hpp>
 #include <vapours/util/util_range.hpp>
+
+#ifdef ATMOSPHERE_IS_STRATOSPHERE
+#include <vapours/util/util_mutex_utils.hpp>
+#endif
diff --git a/stratosphere/boot/source/boot_main.cpp b/stratosphere/boot/source/boot_main.cpp
index b5d3e8c21..c8c238444 100644
--- a/stratosphere/boot/source/boot_main.cpp
+++ b/stratosphere/boot/source/boot_main.cpp
@@ -36,7 +36,7 @@ extern "C" {
     u32 __nx_fs_num_sessions = 1;
 
     /* TODO: Evaluate to what extent this can be reduced further. */
-    #define INNER_HEAP_SIZE 0x1000
+    #define INNER_HEAP_SIZE 0x0
     size_t nx_inner_heap_size = INNER_HEAP_SIZE;
     char   nx_inner_heap[INNER_HEAP_SIZE];
 
@@ -145,6 +145,18 @@ void __appExit(void) {
     fsExit();
 }
 
+namespace ams {
+
+    void *Malloc(size_t size) {
+        AMS_ABORT("ams::Malloc was called");
+    }
+
+    void Free(void *ptr) {
+        AMS_ABORT("ams::Free was called");
+    }
+
+}
+
 void *operator new(size_t size) {
     return Allocate(size);
 }