summaryrefslogtreecommitdiffstats
path: root/src/common/mem_arena.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2014-11-19 10:02:05 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2014-11-19 10:04:03 +0100
commit739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7 (patch)
treec3c44671c32434b4678f502ae06edf5f71157327 /src/common/mem_arena.cpp
parentRemove trailing spaces in every file but the ones imported from SkyEye, AOSP or generated (diff)
downloadyuzu-739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7.tar
yuzu-739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7.tar.gz
yuzu-739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7.tar.bz2
yuzu-739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7.tar.lz
yuzu-739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7.tar.xz
yuzu-739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7.tar.zst
yuzu-739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7.zip
Diffstat (limited to 'src/common/mem_arena.cpp')
-rw-r--r--src/common/mem_arena.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp
index 31ca27b42..67dbaf509 100644
--- a/src/common/mem_arena.cpp
+++ b/src/common/mem_arena.cpp
@@ -38,7 +38,7 @@ void* globalbase = NULL;
// Hopefully this ABI will never change...
-#define ASHMEM_DEVICE "/dev/ashmem"
+#define ASHMEM_DEVICE "/dev/ashmem"
/*
* ashmem_create_region - creates a new ashmem region and returns the file
@@ -273,10 +273,10 @@ u8* MemArena::Find4GBBase()
// yeah, this could also be done in like two bitwise ops...
#define SKIP(a_flags, b_flags)
-// if (!(a_flags & MV_WII_ONLY) && (b_flags & MV_WII_ONLY))
-// continue;
-// if (!(a_flags & MV_FAKE_VMEM) && (b_flags & MV_FAKE_VMEM))
-// continue;
+//if (!(a_flags & MV_WII_ONLY) && (b_flags & MV_WII_ONLY))
+// continue;
+//if (!(a_flags & MV_FAKE_VMEM) && (b_flags & MV_FAKE_VMEM))
+// continue;
static bool Memory_TryBase(u8 *base, const MemoryView *views, int num_views, u32 flags, MemArena *arena) {
// OK, we know where to find free space. Now grab it!