diff options
| author | Eugene Sandulenko | 2005-10-11 11:27:18 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-10-11 11:27:18 +0000 |
| commit | 049dd317d70e89843df12e2d1d859ea850c600ae (patch) | |
| tree | c0715f2c63f2c890fcfb641eae236e812b0cfab0 /common | |
| parent | d63c8c0aee62cc66f36e73420aa6e5685a019cbd (diff) | |
| download | scummvm-rg350-049dd317d70e89843df12e2d1d859ea850c600ae.tar.gz scummvm-rg350-049dd317d70e89843df12e2d1d859ea850c600ae.tar.bz2 scummvm-rg350-049dd317d70e89843df12e2d1d859ea850c600ae.zip | |
Patch #1323715 "OS/2 Patches to ScummVM" and credited the author.
svn-id: r19016
Diffstat (limited to 'common')
| -rw-r--r-- | common/util.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/util.h b/common/util.h index 7f8c810fcf..98ba7cd95a 100644 --- a/common/util.h +++ b/common/util.h @@ -23,6 +23,11 @@ #include "common/scummsys.h" +#if defined (__INNOTEK_LIBC__) +#undef MIN +#undef MAX +#endif + 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; } |