diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-02-09 20:13:11 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-02-09 20:13:11 +1300 |
| commit | 3d480c088fa27c6dcadef40042a0e8deb3093985 (patch) | |
| tree | ab6b184b074261f608dff9b06b5a6e2e6bf52b30 /Source/Core/Common/Src/MemoryUtil.cpp | |
| parent | e62c9b0619a42f6e551ba928560fcb825b6ac9c5 (diff) | |
| parent | a11827cdf0ccc55b9a3f6259a27a9324e24cd018 (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
Diffstat (limited to 'Source/Core/Common/Src/MemoryUtil.cpp')
| -rw-r--r-- | Source/Core/Common/Src/MemoryUtil.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp index ebfa380be4..0888746d42 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -117,7 +117,8 @@ void* AllocateAlignedMemory(size_t size,size_t alignment) void* ptr = _aligned_malloc(size,alignment);
#else
void* ptr = NULL;
- posix_memalign(&ptr, alignment, size);
+ if (posix_memalign(&ptr, alignment, size) != 0)
+ ERROR_LOG(MEMMAP, "Failed to allocate aligned memory");
;
#endif
|