projects
/
matthijs
/
ABM2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Make the InputTask quit the program on escape.
[matthijs/ABM2.git]
/
ABM2
/
Engine
/
misc.h
diff --git
a/ABM2/Engine/misc.h
b/ABM2/Engine/misc.h
index 55b3f9964a00ec0194d740c0f8181565b61f6183..ea260d5e5b12808a68e6b53e2b7c6afcdc05acbe 100755
(executable)
--- a/
ABM2/Engine/misc.h
+++ b/
ABM2/Engine/misc.h
@@
-1,11
+1,6
@@
#ifndef MISC_H_INCLUDED
\r
#define MISC_H_INCLUDED
\r
\r
#ifndef MISC_H_INCLUDED
\r
#define MISC_H_INCLUDED
\r
\r
-#ifndef WIN32
\r
-/* HACK to get this to compile */
\r
-#define max(a,b) (a>b?a:b)
\r
-#define min(a,b) (a<b?a:b)
\r
-#endif // !WIN32
\r
inline float clamp(float val, float minVal, float maxVal)
\r
{
\r
return min(max(val,minVal),maxVal);
\r
inline float clamp(float val, float minVal, float maxVal)
\r
{
\r
return min(max(val,minVal),maxVal);
\r