From 9ac2255fbcee4049ed4067fc18c8cabccef1047e Mon Sep 17 00:00:00 2001
From: Venugh <venugh@gmx.net>
Date: Mon, 9 Apr 2012 17:10:54 +0200
Subject: fix all build errors, only 1 linking error.

---
 src/server/shared/Memory.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/server/shared/Memory.h

(limited to 'src/server/shared/Memory.h')

diff --git a/src/server/shared/Memory.h b/src/server/shared/Memory.h
new file mode 100644
index 00000000000..ac697f7a1af
--- /dev/null
+++ b/src/server/shared/Memory.h
@@ -0,0 +1,17 @@
+
+
+#ifndef _MEMORY_H
+#define _MEMORY_H
+
+//  memory management
+inline void* dtCustomAlloc(int size, dtAllocHint /*hint*/)
+{
+    return (void*)new unsigned char[size];
+}
+
+inline void dtCustomFree(void* ptr)
+{
+    delete [] (unsigned char*)ptr;
+}
+
+#endif
\ No newline at end of file
-- 
cgit v1.2.3


From 05efdaf39349f057eabf58252532dff76511e7ef Mon Sep 17 00:00:00 2001
From: Vincent_Michael <Vincent_Michael@gmx.de>
Date: Wed, 2 Jan 2013 13:58:36 +0100
Subject: Core: Fix non pch build

---
 src/server/shared/Memory.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/server/shared/Memory.h')

diff --git a/src/server/shared/Memory.h b/src/server/shared/Memory.h
index ac697f7a1af..25533638915 100644
--- a/src/server/shared/Memory.h
+++ b/src/server/shared/Memory.h
@@ -3,6 +3,8 @@
 #ifndef _MEMORY_H
 #define _MEMORY_H
 
+#include "DetourAlloc.h"
+
 //  memory management
 inline void* dtCustomAlloc(int size, dtAllocHint /*hint*/)
 {
-- 
cgit v1.2.3