diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/stdafx.h | 1 | ||||
| -rw-r--r-- | common/util.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/common/stdafx.h b/common/stdafx.h index 2d59efe688..9a72493129 100644 --- a/common/stdafx.h +++ b/common/stdafx.h @@ -97,6 +97,7 @@ #undef CMD_INVALID #endif #if !defined(macintosh) +#include <sys/param.h> #include <sys/types.h> #include <sys/uio.h> #endif diff --git a/common/util.h b/common/util.h index 68c47a1fb5..0df4e54a59 100644 --- a/common/util.h +++ b/common/util.h @@ -24,8 +24,12 @@ #include "common/scummsys.h" template<typename T> inline T ABS (T x) { return (x>=0) ? x : -x; } +#if !defined(MIN) template<typename T> inline T MIN (T a, T b) { return (a<b) ? a : b; } +#endif +#if !defined(MAX) template<typename T> inline T MAX (T a, T b) { return (a>b) ? a : b; } +#endif /** * Template method which swaps the vaulues of its two parameters. |