[Scummvm-cvs-logs] CVS: scummvm/common util.h,1.54,1.55

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23952/common

Modified Files:
	util.h 
Log Message:
Patch #1323715 "OS/2 Patches to ScummVM" and credited the author.


Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- util.h	30 Jul 2005 21:10:58 -0000	1.54
+++ util.h	11 Oct 2005 11:27:18 -0000	1.55
@@ -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; }