X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=ABM2%2FEngine%2Fmisc.h;h=55b3f9964a00ec0194d740c0f8181565b61f6183;hb=357a451150c18b27f99cecd5f9d13be1ae5a9fdf;hp=843c97f18e75fef8b4c99f1ab9a7e474143525a1;hpb=0b314338a46fe83c1c4bb646da858ebd5d4a7317;p=matthijs%2FABM2.git

diff --git a/ABM2/Engine/misc.h b/ABM2/Engine/misc.h
index 843c97f..55b3f99 100755
--- a/ABM2/Engine/misc.h
+++ b/ABM2/Engine/misc.h
@@ -1,8 +1,11 @@
 #ifndef MISC_H_INCLUDED
 #define MISC_H_INCLUDED
 
-
-
+#ifndef WIN32
+/* HACK to get this to compile */
+#define max(a,b) (a>b?a:b)
+#define min(a,b) (a<b?a:b)
+#endif // !WIN32
 inline float clamp(float val, float minVal, float maxVal)
 {
 	return min(max(val,minVal),maxVal);