[Scummvm-cvs-logs] CVS: scummvm/common stdafx.h,1.17,1.18 util.h,1.44,1.45

Jonathan Gray khalek at users.sourceforge.net
Mon Sep 27 21:23:39 CEST 2004


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

Modified Files:
	stdafx.h util.h 
Log Message:
use MAXPATHLEN for path buffer size

Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/stdafx.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- stdafx.h	6 Jan 2004 12:45:28 -0000	1.17
+++ stdafx.h	28 Sep 2004 04:14:57 -0000	1.18
@@ -97,6 +97,7 @@
 #undef CMD_INVALID
 #endif
 #if !defined(macintosh)
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #endif

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- util.h	15 Mar 2004 01:52:07 -0000	1.44
+++ util.h	28 Sep 2004 04:14:57 -0000	1.45
@@ -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.





More information about the Scummvm-git-logs mailing list