From e7c18fc17f82c40e937367726e07a58d5d4d7bce Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Fri, 27 Mar 2020 20:53:47 +0100
Subject: removed windows.h for most .cpps

---
 src/core/common.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/core/common.h')

diff --git a/src/core/common.h b/src/core/common.h
index 3127cb12..0cdff871 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -8,10 +8,15 @@
 #pragma warning(disable: 4996)  // POSIX names
 
 #include <stdint.h>
+#include <string.h>
 #include <math.h>
 //#include <assert.h>
 #include <new>
 
+#ifdef WITHWINDOWS
+#include <Windows.h>
+#endif
+
 #ifdef WITHD3D
 #include <windows.h>
 #include <d3d8types.h>
@@ -30,6 +35,16 @@
 #undef near
 #endif
 
+#ifndef max
+#define max(a,b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef min
+#define min(a,b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef ARRAYSIZE
+#define ARRAYSIZE(a) (sizeof(a) / sizeof(*(a)))
+#endif
+
 typedef uint8_t uint8;
 typedef int8_t int8;
 typedef uint16_t uint16;
-- 
cgit v1.2.3


From 739e80614db70f726c47180173ba19688bec5167 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sat, 28 Mar 2020 09:37:04 +0100
Subject: remove include <new> from common.h

---
 src/core/common.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/core/common.h')

diff --git a/src/core/common.h b/src/core/common.h
index 0cdff871..7b4ff4a0 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -10,8 +10,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <math.h>
-//#include <assert.h>
-#include <new>
 
 #ifdef WITHWINDOWS
 #include <Windows.h>
-- 
cgit v1.2.3