[Scummvm-cvs-logs] CVS: scummvm/backends/morphos morphos.cpp,1.24,1.25 morphos.h,1.14,1.15

Max Horn fingolfin at users.sourceforge.net
Sat Jul 5 08:18:14 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/morphos
In directory sc8-pr-cvs1:/tmp/cvs-serv22014/morphos

Modified Files:
	morphos.cpp morphos.h 
Log Message:
updated backends to use type MutexRef

Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- morphos.cpp	5 Jul 2003 09:08:38 -0000	1.24
+++ morphos.cpp	5 Jul 2003 15:17:46 -0000	1.25
@@ -316,27 +316,27 @@
 													 NP_PPC_Arg1, (ULONG) param, TAG_DONE);
 }
 
-void *OSystem_MorphOS::create_mutex()
+MutexRef OSystem_MorphOS::create_mutex()
 {
 	SignalSemaphore *sem = (SignalSemaphore *) AllocVec(sizeof (SignalSemaphore), MEMF_PUBLIC);
 
 	if (sem)
 		InitSemaphore(sem);
 
-	return sem;
+	return (MutexRef)sem;
 }
 
-void OSystem_MorphOS::lock_mutex(void *mutex)
+void OSystem_MorphOS::lock_mutex(MutexRef mutex)
 {
 	ObtainSemaphore((SignalSemaphore *) mutex);
 }
 
-void OSystem_MorphOS::unlock_mutex(void *mutex)
+void OSystem_MorphOS::unlock_mutex(MutexRef mutex)
 {
 	ReleaseSemaphore((SignalSemaphore *)mutex);
 }
 
-void OSystem_MorphOS::delete_mutex(void *mutex)
+void OSystem_MorphOS::delete_mutex(MutexRef mutex)
 {
 	FreeVec(mutex);
 }

Index: morphos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- morphos.h	5 Jul 2003 09:08:38 -0000	1.14
+++ morphos.h	5 Jul 2003 15:17:46 -0000	1.15
@@ -85,10 +85,10 @@
 		virtual void set_timer(int timer, int (*callback)(int));
 
 		// Mutex handling
-		virtual void *create_mutex();
-		virtual void lock_mutex(void *mutex);
-		virtual void unlock_mutex(void *mutex);
-		virtual void delete_mutex(void *mutex);
+		virtual MutexRef create_mutex();
+		virtual void lock_mutex(MutexRef mutex);
+		virtual void unlock_mutex(MutexRef mutex);
+		virtual void delete_mutex(MutexRef mutex);
 
 		// Create a thread
 		virtual void create_thread(ThreadProc *proc, void *param);





More information about the Scummvm-git-logs mailing list