[Scummvm-cvs-logs] CVS: scummvm/backends/x11 x11.cpp,1.11,1.12

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


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

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

Index: x11.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/x11/x11.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- x11.cpp	29 May 2003 22:34:35 -0000	1.11
+++ x11.cpp	5 Jul 2003 15:17:46 -0000	1.12
@@ -121,10 +121,10 @@
 	void set_timer(int timer, int (*callback) (int));
 
 	// Mutex handling
-	void *create_mutex();
-	void lock_mutex(void *mutex);
-	void unlock_mutex(void *mutex);
-	void delete_mutex(void *mutex);
+	MutexRef create_mutex();
+	void lock_mutex(MutexRef mutex);
+	void unlock_mutex(MutexRef mutex);
+	void delete_mutex(MutexRef mutex);
 
         // Overlay handling for the new menu system
 	void show_overlay();
@@ -1029,24 +1029,24 @@
 	}
 }
 
-void *OSystem_X11::create_mutex()
+MutexRef OSystem_X11::create_mutex()
 {
 	pthread_mutex_t *mutex = (pthread_mutex_t *) malloc(sizeof(pthread_mutex_t));
 	pthread_mutex_init(mutex, NULL);
-	return (void *)mutex;
+	return (MutexRef)mutex;
 }
 
-void OSystem_X11::lock_mutex(void *mutex)
+void OSystem_X11::lock_mutex(MutexRef mutex)
 {
 	pthread_mutex_lock((pthread_mutex_t *) mutex);
 }
 
-void OSystem_X11::unlock_mutex(void *mutex)
+void OSystem_X11::unlock_mutex(MutexRef mutex)
 {
 	pthread_mutex_unlock((pthread_mutex_t *) mutex);
 }
 
-void OSystem_X11::delete_mutex(void *mutex)
+void OSystem_X11::delete_mutex(MutexRef mutex)
 {
 	pthread_mutex_destroy((pthread_mutex_t *) mutex);
 	free(mutex);





More information about the Scummvm-git-logs mailing list