diff options
| author | bunnei <bunneidev@gmail.com> | 2014-11-19 15:24:46 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-11-19 15:24:46 -0500 |
| commit | c0cd0fa78edc37795176c6fb45a52c1d015f3690 (patch) | |
| tree | 237f15dd9d986309000c995fde07088625e62239 /src/common/mem_arena.cpp | |
| parent | 112768f4365816d345b0dc9b93bfecc3d41a69b5 (diff) | |
| parent | 739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7 (diff) | |
Merge pull request #211 from linkmauve/master
Remove trailing spaces from the entire project
Diffstat (limited to 'src/common/mem_arena.cpp')
| -rw-r--r-- | src/common/mem_arena.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp index 40d9c03a2..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 @@ -272,11 +272,11 @@ 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; +#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; 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! |