ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #705 from Sonicadvance1/fix-memoryutil-check 

Fixes a check for what mmap returns.
This commit is contained in:
Lioncash 2014-07-31 03:06:00 -04:00
parent 5bb9a74759 33450c80c3
commit c5188c76b3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/MemoryUtil.cpp
View File

@ -54,13 +54,13 @@ void* AllocateExecutableMemory(size_t size, bool low)
// printf("Mapped executable memory at %p (size %ld)\n", ptr, // printf("Mapped executable memory at %p (size %ld)\n", ptr,
// (unsigned long)size); // (unsigned long)size);
#if defined(__FreeBSD__) #ifdef _WIN32
if (ptr == nullptr)
{
#else
if (ptr == MAP_FAILED) if (ptr == MAP_FAILED)
{ {
ptr = nullptr; ptr = nullptr;
#else
if (ptr == nullptr)
{
#endif #endif
PanicAlert("Failed to allocate executable memory"); PanicAlert("Failed to allocate executable memory");
} }