$OpenBSD$
--- src/m_alloc.cpp.orig	Sat May 14 18:04:06 2011
+++ src/m_alloc.cpp	Sat May 14 18:13:22 2011
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <malloc/malloc.h>
 #else
-#include <malloc.h>
+#include <stdlib.h>
 #endif
 
 #include "i_system.h"
@@ -50,44 +50,44 @@
 #define _malloc_dbg(s,b,f,l)	malloc(s)
 #define _realloc_dbg(p,s,b,f,l)	realloc(p,s)
 #endif
-#if defined(__APPLE__)
-#define _msize(p)				malloc_size(p)
-#elif defined(__sun)
+//#if defined(__APPLE__)
+//#define _msize(p)				malloc_size(p)
+//#elif defined(__sun)
 #define _msize(p)				(*((size_t*)(p)-1))
-#elif !defined(_WIN32)
-#define _msize(p)				malloc_usable_size(p)	// from glibc/FreeBSD
-#endif
+//#elif !defined(_WIN32)
+//#define _msize(p)				malloc_usable_size(p)	// from glibc/FreeBSD
+//#endif
 
 #ifndef _DEBUG
-#if !defined(__sun)
+//#if !defined(__sun)
+//void *M_Malloc(size_t size)
+//{
+//	void *block = malloc(size);
+//
+//	if (block == NULL)
+//		I_FatalError("Could not malloc %zu bytes", size);
+//
+//	GC::AllocBytes += _msize(block);
+//	return block;
+//}
+//
+//void *M_Realloc(void *memblock, size_t size)
+//{
+//	if (memblock != NULL)
+//	{
+//		GC::AllocBytes -= _msize(memblock);
+//	}
+//	void *block = realloc(memblock, size);
+//	if (block == NULL)
+//	{
+//		I_FatalError("Could not realloc %zu bytes", size);
+//	}
+//	GC::AllocBytes += _msize(block);
+//	return block;
+//}
+//#else
 void *M_Malloc(size_t size)
 {
-	void *block = malloc(size);
-
-	if (block == NULL)
-		I_FatalError("Could not malloc %zu bytes", size);
-
-	GC::AllocBytes += _msize(block);
-	return block;
-}
-
-void *M_Realloc(void *memblock, size_t size)
-{
-	if (memblock != NULL)
-	{
-		GC::AllocBytes -= _msize(memblock);
-	}
-	void *block = realloc(memblock, size);
-	if (block == NULL)
-	{
-		I_FatalError("Could not realloc %zu bytes", size);
-	}
-	GC::AllocBytes += _msize(block);
-	return block;
-}
-#else
-void *M_Malloc(size_t size)
-{
 	void *block = malloc(size+sizeof(size_t));
 
 	if (block == NULL)
@@ -123,41 +123,41 @@ void *M_Realloc(void *memblock, size_t size)
 	GC::AllocBytes += _msize(block);
 	return block;
 }
-#endif
+//#endif
 #else
 #ifdef _MSC_VER
 #include <crtdbg.h>
 #endif
 
-#if !defined(__sun)
+//#if !defined(__sun)
+//void *M_Malloc_Dbg(size_t size, const char *file, int lineno)
+//{
+//	void *block = _malloc_dbg(size, _NORMAL_BLOCK, file, lineno);
+//
+//	if (block == NULL)
+//		I_FatalError("Could not malloc %zu bytes", size);
+//
+//	GC::AllocBytes += _msize(block);
+//	return block;
+//}
+//
+//void *M_Realloc_Dbg(void *memblock, size_t size, const char *file, int lineno)
+//{
+//	if (memblock != NULL)
+//	{
+//		GC::AllocBytes -= _msize(memblock);
+//	}
+//	void *block = _realloc_dbg(memblock, size, _NORMAL_BLOCK, file, lineno);
+//	if (block == NULL)
+//	{
+//		I_FatalError("Could not realloc %zu bytes", size);
+//	}
+//	GC::AllocBytes += _msize(block);
+//	return block;
+//}
+//#else
 void *M_Malloc_Dbg(size_t size, const char *file, int lineno)
 {
-	void *block = _malloc_dbg(size, _NORMAL_BLOCK, file, lineno);
-
-	if (block == NULL)
-		I_FatalError("Could not malloc %zu bytes", size);
-
-	GC::AllocBytes += _msize(block);
-	return block;
-}
-
-void *M_Realloc_Dbg(void *memblock, size_t size, const char *file, int lineno)
-{
-	if (memblock != NULL)
-	{
-		GC::AllocBytes -= _msize(memblock);
-	}
-	void *block = _realloc_dbg(memblock, size, _NORMAL_BLOCK, file, lineno);
-	if (block == NULL)
-	{
-		I_FatalError("Could not realloc %zu bytes", size);
-	}
-	GC::AllocBytes += _msize(block);
-	return block;
-}
-#else
-void *M_Malloc_Dbg(size_t size, const char *file, int lineno)
-{
 	void *block = _malloc_dbg(size+sizeof(size_t), _NORMAL_BLOCK, file, lineno);
 
 	if (block == NULL)
@@ -194,26 +194,26 @@ void *M_Realloc_Dbg(void *memblock, size_t size, const
 	GC::AllocBytes += _msize(block);
 	return block;
 }
+//#endif
 #endif
-#endif
 
-#if !defined(__sun)
+//#if defined(__sun)
+//void M_Free (void *block)
+//{
+//	if (block != NULL)
+//	{
+//		GC::AllocBytes -= _msize(block);
+//		free(block);
+//	}
+//}
+//#else
 void M_Free (void *block)
 {
-	if (block != NULL)
-	{
-		GC::AllocBytes -= _msize(block);
-		free(block);
-	}
-}
-#else
-void M_Free (void *block)
-{
 	if(block != NULL)
 	{
 		GC::AllocBytes -= _msize(block);
 		free(((size_t*) block)-1);
 	}
 }
-#endif
+//#endif