From 525e6b9f9941036d2f3872e3dd4bc4cb53a7ccc7 Mon Sep 17 00:00:00 2001
From: Marcus Minhorst <marcus.minhorst@gmail.com>
Date: Mon, 16 Jun 2025 16:13:15 -0400
Subject: [PATCH] Added _msize stub for Solaris

---
 src/common/utility/m_alloc.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/common/utility/m_alloc.cpp b/src/common/utility/m_alloc.cpp
index 5884b48e8..b42cbf612 100644
--- a/src/common/utility/m_alloc.cpp
+++ b/src/common/utility/m_alloc.cpp
@@ -43,6 +43,15 @@
 #else
 #include <malloc.h>
 #endif
+#if defined(__sun__) || defined(__sun)
+size_t _msize(void* block)
+{
+	// TODO: find an actual fix for solaris
+	(void) block;
+	return 0;
+}
+#endif
+
 
 #include "engineerrors.h"
 #include "dobjgc.h"
@@ -54,7 +63,7 @@
 #endif
 
 #ifndef _DEBUG
-#if !defined(__solaris__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+#if !defined(__solaris__) && !defined(__sun__) && !defined(_sun) && !defined(__OpenBSD__) && !defined(__DragonFly__)
 void *M_Malloc(size_t size)
 {
 	void *block = malloc(size);
@@ -127,7 +136,7 @@ void* M_Calloc(size_t v1, size_t v2)
 #include <crtdbg.h>
 #endif
 
-#if !defined(__solaris__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+#if !defined(__solaris__) && !defined(__sun__) && !defined(_sun) && !defined(__OpenBSD__) && !defined(__DragonFly__)
 void *M_Malloc_Dbg(size_t size, const char *file, int lineno)
 {
 	void *block = _malloc_dbg(size, _NORMAL_BLOCK, file, lineno);
@@ -194,7 +203,7 @@ void M_Free (void *block)
 	if (block != nullptr)
 	{
 		GC::ReportDealloc(_msize(block));
-#if !defined(__solaris__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+#if !defined(__solaris__) && !defined(__sun__) && !defined(_sun) && !defined(__OpenBSD__) && !defined(__DragonFly__)
 		free(block);
 #else
 		free(((size_t*) block)-1);