[Scummvm-cvs-logs] CVS: scummvm/sky intro.cpp,1.52,1.53
Max Horn
fingolfin at users.sourceforge.net
Sat Dec 25 15:36:35 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.43,1.44 dialog.h,1.28,1.29
- Next message: [Scummvm-cvs-logs] CVS: scummvm README,1.306,1.307 TODO,1.202,1.203 scummvm.6,1.21,1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23613/sky
Modified Files:
intro.cpp
Log Message:
Fix warning on OSX
Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- intro.cpp 5 Dec 2004 17:42:19 -0000 1.52
+++ intro.cpp 25 Dec 2004 23:35:30 -0000 1.53
@@ -32,6 +32,13 @@
namespace Sky {
+#ifdef MACOSX
+// FIXME: DELAY is already defined in sys/param.h !
+// Better fix would be to remove sys/param.h froms stdafx.h, or
+// to change the name DELAY here to something else.
+#undef DELAY
+#endif
+
#define SHOWSCREEN 0
#define COMMANDEND 0 // end of COMMANDFLIRT block
#define FADEUP 1 // fade up palette
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.43,1.44 dialog.h,1.28,1.29
- Next message: [Scummvm-cvs-logs] CVS: scummvm README,1.306,1.307 TODO,1.202,1.203 scummvm.6,1.21,1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list