From c54d3ba2ab218b9545e784abaf39b4054d3de4bc Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sat, 16 May 2020 14:34:51 +0200
Subject: fixes for 64 bit build

---
 src/rw/RwHelper.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/rw/RwHelper.cpp')

diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index 5026e2c8..191fc7ab 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -59,6 +59,16 @@ void FlushObrsPrintfs()
 void *
 RwMallocAlign(RwUInt32 size, RwUInt32 align)
 {
+#ifdef FIX_BUGS
+	uintptr ptralign = align-1;
+	void *mem = (void *)malloc(size + sizeof(uintptr) + ptralign);
+
+	ASSERT(mem != nil);
+
+	void *addr = (void *)((((uintptr)mem) + sizeof(uintptr) + ptralign) & ~ptralign);
+
+	ASSERT(addr != nil);
+#else
 	void *mem = (void *)malloc(size + align);
 
 	ASSERT(mem != nil);
@@ -66,6 +76,7 @@ RwMallocAlign(RwUInt32 size, RwUInt32 align)
 	void *addr = (void *)((((uintptr)mem) + align) & ~(align - 1));
 
 	ASSERT(addr != nil);
+#endif
 
 	*(((void **)addr) - 1) = mem;
 
-- 
cgit v1.2.3