[Scummvm-cvs-logs] CVS: scummvm/common timer.cpp,1.16,1.17 timer.h,1.10,1.11 system.h,1.44,1.45

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv30803/common

Modified Files:
	timer.cpp timer.h system.h 
Log Message:
removed duplicate g_timer object (one was global, one was static to timer.cpp); set g_system earlier (might prevent a few race conditions)

Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- timer.cpp	28 Sep 2003 00:59:01 -0000	1.16
+++ timer.cpp	28 Sep 2003 21:08:47 -0000	1.17
@@ -25,7 +25,7 @@
 #include "common/timer.h"
 #include "common/util.h"
 
-static Timer *g_timer = NULL;
+Timer *g_timer = NULL;
 
 Timer::Timer(OSystem *system) :
 	_system(system),

Index: timer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- timer.h	10 Sep 2003 12:43:53 -0000	1.10
+++ timer.h	28 Sep 2003 21:08:47 -0000	1.11
@@ -60,6 +60,8 @@
 	int handler(int t);
 };
 
+extern Timer *g_timer;
+
 #endif
 
 #endif

Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- system.h	27 Sep 2003 16:54:11 -0000	1.44
+++ system.h	28 Sep 2003 21:08:47 -0000	1.45
@@ -349,4 +349,7 @@
 	//@}
 };
 
+/** The global OSystem instance. Inited in main(). */
+extern OSystem *g_system;
+
 #endif