[Scummvm-cvs-logs] CVS: scummvm system.h,1.20,1.21 sdl.cpp,1.121,1.122

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv2149

Modified Files:
	system.h sdl.cpp 
Log Message:
fixed compilation on more strict compilers

Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/system.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- system.h	14 May 2002 18:14:16 -0000	1.20
+++ system.h	14 May 2002 19:38:28 -0000	1.21
@@ -137,7 +137,7 @@
 	virtual void update_cdrom() = 0;
 
 	// Add a new callback timer
-	virtual void set_timer(int timer, void* callback) = 0;
+	virtual void set_timer(int timer, int (*callback)(int)) = 0;
 
 	// Quit
 	virtual void quit() = 0;

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- sdl.cpp	14 May 2002 18:14:15 -0000	1.121
+++ sdl.cpp	14 May 2002 19:38:28 -0000	1.122
@@ -97,7 +97,7 @@
 	uint32 property(int param, Property *value);
 
 	// Add a callback timer
-	void set_timer(int timer, void* callback);
+	void set_timer(int timer, int (*callback)(int));
 
 	static OSystem *create(int gfx_mode, bool full_screen);
 
@@ -229,7 +229,7 @@
 	return syst;
 }
 
-void OSystem_SDL::set_timer(int timer, void* callback) {
+void OSystem_SDL::set_timer(int timer, int (*callback)(int)) {
 	SDL_SetTimer(timer, (SDL_TimerCallback) callback);
 }
 OSystem *OSystem_SDL_create(int gfx_mode, bool full_screen) {