summaryrefslogtreecommitdiff
path: root/Source/Core/Common/Src/MemArena.cpp
diff options
context:
space:
mode:
authorSonicadvance1 <sonicadvance1@gmail.com>2008-07-23 08:49:58 +0000
committerSonicadvance1 <sonicadvance1@gmail.com>2008-07-23 08:49:58 +0000
commit1d175eadd7eed113a3050fc4ffa9bb521fb614ca (patch)
tree9d531ceff4325efc7174f41e6f2b05b7a8be8831 /Source/Core/Common/Src/MemArena.cpp
parentf9582bef302ac9354c348bc88efb16fdf8b783a1 (diff)
Linux: Fixes so it compiles in 32bit. Now a Config dialog for the video plugin, Linux only, if you want to change for Windows, work on it
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@61 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/MemArena.cpp')
-rw-r--r--Source/Core/Common/Src/MemArena.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp
index 4455f99004..11a87d524c 100644
--- a/Source/Core/Common/Src/MemArena.cpp
+++ b/Source/Core/Common/Src/MemArena.cpp
@@ -64,8 +64,11 @@ void* MemArena::CreateView(s64 offset, size_t size, bool ensure_low_mem)
#else
void* ptr = mmap(0, size,
PROT_READ | PROT_WRITE,
- MAP_SHARED | (ensure_low_mem ? MAP_32BIT : 0),
- fd, offset);
+ MAP_SHARED
+#ifdef __x86_64__
+ | (ensure_low_mem ? MAP_32BIT : 0)
+#endif
+ , fd, offset);
if (!ptr)
{