[Scummvm-cvs-logs] SF.net SVN: scummvm: [29919] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 29919
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29919&view=rev
Author:   fingolfin
Date:     2007-12-20 06:29:58 -0800 (Thu, 20 Dec 2007)

Log Message:
-----------
Do not #include time.h globally (ideally, we should provide a localtime clone in OSystem so we can completly get rid of this)

Modified Paths:
--------------
    scummvm/trunk/common/scummsys.h
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/gob/inter.cpp
    scummvm/trunk/engines/scumm/saveload.cpp
    scummvm/trunk/engines/scumm/script_v6.cpp

Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h	2007-12-20 14:29:09 UTC (rev 29918)
+++ scummvm/trunk/common/scummsys.h	2007-12-20 14:29:58 UTC (rev 29919)
@@ -114,7 +114,6 @@
 	#include <stdarg.h>
 	#include <assert.h>
 	#include <ctype.h>
-	#include <time.h>
 	#include <math.h>
 
 #endif

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2007-12-20 14:29:09 UTC (rev 29918)
+++ scummvm/trunk/engines/agos/agos.cpp	2007-12-20 14:29:58 UTC (rev 29919)
@@ -38,6 +38,8 @@
 #include "sound/mididrv.h"
 #include "sound/mods/protracker.h"
 
+#include <time.h>	// for AGOSEngine::getTime()
+
 using Common::File;
 
 namespace AGOS {

Modified: scummvm/trunk/engines/gob/inter.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter.cpp	2007-12-20 14:29:09 UTC (rev 29918)
+++ scummvm/trunk/engines/gob/inter.cpp	2007-12-20 14:29:58 UTC (rev 29919)
@@ -36,6 +36,8 @@
 #include "gob/scenery.h"
 #include "gob/sound.h"
 
+#include <time.h>	// FIXME: for Inter::renewTimeInVars()
+
 namespace Gob {
 
 Inter::Inter(GobEngine *vm) : _vm(vm) {

Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp	2007-12-20 14:29:09 UTC (rev 29918)
+++ scummvm/trunk/engines/scumm/saveload.cpp	2007-12-20 14:29:58 UTC (rev 29919)
@@ -46,6 +46,8 @@
 #include "sound/audiocd.h"
 #include "sound/mixer.h"
 
+#include <time.h>	// for ScummEngine::saveInfos / ScummEngine::loadInfos
+
 namespace Scumm {
 
 struct SaveGameHeader {

Modified: scummvm/trunk/engines/scumm/script_v6.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v6.cpp	2007-12-20 14:29:09 UTC (rev 29918)
+++ scummvm/trunk/engines/scumm/script_v6.cpp	2007-12-20 14:29:58 UTC (rev 29919)
@@ -45,6 +45,8 @@
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
 
+#include <time.h>	// for ScummEngine_v6::o6_getDateTime()
+
 namespace Scumm {
 
 #define OPCODE(x)	_OPCODE(ScummEngine_v6, x)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.