osx : malloc.h => malloc/malloc.h

engine/common.cpp

@@ -16,7 +16,11 @@
 #include <characterset.h>
 #include <bitbuf.h>
 #include "common.h"
+#ifdef OSX
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 #include "traceinit.h"
 #include <filesystem.h>
 #include "filesystem_engine.h"

engine/decals.cpp

@@ -14,7 +14,11 @@
 #include "filesystem.h"
 #include "filesystem_engine.h"
 #include "materialsystem/imaterial.h"
+#ifdef OSX
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 #include "utldict.h"
 
 // memdbgon must be the last include file in a .cpp file!!!

engine/materialproxyfactory.cpp

@@ -6,7 +6,6 @@
 //=============================================================================//
 
 #include <stdlib.h>
-#include <malloc.h>
 #include <string.h>
 #include "materialsystem/imaterialproxy.h"
 #include "materialproxyfactory.h"

engine/packed_entity.cpp

@@ -5,7 +5,11 @@
 // $NoKeywords: $
 //
 //=============================================================================//
+#ifdef OSX
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 #include <string.h>
 #include <assert.h>
 #include "packed_entity.h"

engine/pr_edict.cpp

@@ -32,7 +32,11 @@
 
 
 #ifdef _DEBUG
+#ifdef OSX
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 #endif // _DEBUG
 
 static ConVar		sv_useexplicitdelete( "sv_useexplicitdelete", "1", FCVAR_DEVELOPMENTONLY, "Explicitly delete dormant client entities caused by AllowImmediateReuse()." );

engine/zone.cpp

@@ -133,7 +133,14 @@ void Hunk_Print()
 void Memory_Init( void )
 {
 	MEM_ALLOC_CREDIT();
+
+#ifdef PLATFORM_64BITS
+    // Seems to need to be larger to not get exhausted on
+    // 64-bit. Perhaps because of larger pointer sizes.
+    int nMaxBytes = 128*1024*1024;
+#else
 	int nMaxBytes = 48*1024*1024;
+#endif
 	const int nMinCommitBytes = 0x8000;
 #ifndef HUNK_USE_16MB_PAGE
 	const int nInitialCommit = 0x280000;