gthread: rename functions to match static variants

1 files changed, 33 insertions, 33 deletions

diff --git a/glib/gthread.h b/glib/gthread.h
index 3b764fd96..5bf7acdc7 100644
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -116,14 +116,14 @@ struct _GThreadFunctions
 typedef struct _GThreadFunctions2 GThreadFunctions2;
 struct _GThreadFunctions2
 {
-  GRWMutex*  (*rw_mutex_new)           (void);
-  void       (*rw_mutex_read_lock)     (GRWMutex               *mutex);
-  gboolean   (*rw_mutex_read_trylock)  (GRWMutex               *mutex);
-  void       (*rw_mutex_read_unlock)   (GRWMutex               *mutex);
-  void       (*rw_mutex_write_lock)    (GRWMutex               *mutex);
-  gboolean   (*rw_mutex_write_trylock) (GRWMutex               *mutex);
-  void       (*rw_mutex_write_unlock)  (GRWMutex               *mutex);
-  void       (*rw_mutex_free)          (GRWMutex               *mutex);
+  GRWMutex*  (*rw_mutex_new)            (void);
+  void       (*rw_mutex_reader_lock)    (GRWMutex               *mutex);
+  gboolean   (*rw_mutex_reader_trylock) (GRWMutex               *mutex);
+  void       (*rw_mutex_reader_unlock)  (GRWMutex               *mutex);
+  void       (*rw_mutex_writer_lock)    (GRWMutex               *mutex);
+  gboolean   (*rw_mutex_writer_trylock) (GRWMutex               *mutex);
+  void       (*rw_mutex_writer_unlock)  (GRWMutex               *mutex);
+  void       (*rw_mutex_free)           (GRWMutex               *mutex);
 };
 
 GLIB_VAR GThreadFunctions       g_thread_functions_for_glib_use;
@@ -185,7 +185,7 @@ GMutex* g_static_mutex_get_mutex_impl   (GMutex **mutex);
     (g_thread_supported () ? G_THREAD2_UF (op, arg) : (fail))
 #define G_THREAD2_ECF(op, fail, mutex, type)				\
     (g_thread_supported () ? 						\
-      ((type(*)(GMutex*, const gulong, gchar const*))			\
+      ((type(*)(GRWMutex*, const gulong, gchar const*))			\
       (*g_thread_functions2_for_glib_use . op))				\
      (mutex, G_MUTEX_DEBUG_MAGIC, G_STRLOC) : (fail))
 
@@ -203,18 +203,18 @@ GMutex* g_static_mutex_get_mutex_impl   (GMutex **mutex);
 # define g_cond_timed_wait(cond, mutex, abs_time)			\
     G_THREAD_CF (cond_timed_wait, TRUE,   (cond, mutex, abs_time))
 
-# define g_rw_mutex_read_lock(mutex)					\
-    G_THREAD2_CF (rw_mutex_read_lock,     (void)0, (mutex))
-# define g_rw_mutex_read_trylock(mutex)					\
-    G_THREAD2_CF (rw_mutex_read_trylock,  TRUE,    (mutex))
-# define g_rw_mutex_read_unlock(mutex)					\
-    G_THREAD2_CF (rw_mutex_read_unlock,   (void)0, (mutex))
-# define g_rw_mutex_write_lock(mutex)					\
-    G_THREAD2_CF (rw_mutex_write_lock,    (void)0, (mutex))
-# define g_rw_mutex_write_trylock(mutex)				\
-    G_THREAD2_CF (rw_mutex_write_trylock, TRUE,    (mutex))
-# define g_rw_mutex_write_unlock(mutex)					\
-    G_THREAD2_CF (rw_mutex_write_unlock,  (void)0, (mutex))
+# define g_rw_mutex_reader_lock(mutex)					\
+    G_THREAD2_CF (rw_mutex_reader_lock,     (void)0, (mutex))
+# define g_rw_mutex_reader_trylock(mutex)				\
+    G_THREAD2_CF (rw_mutex_reader_trylock,  TRUE,    (mutex))
+# define g_rw_mutex_reader_unlock(mutex)				\
+    G_THREAD2_CF (rw_mutex_reader_unlock,   (void)0, (mutex))
+# define g_rw_mutex_writer_lock(mutex)					\
+    G_THREAD2_CF (rw_mutex_writer_lock,    (void)0, (mutex))
+# define g_rw_mutex_writer_trylock(mutex)				\
+    G_THREAD2_CF (rw_mutex_writer_trylock, TRUE,    (mutex))
+# define g_rw_mutex_writer_unlock(mutex)				\
+    G_THREAD2_CF (rw_mutex_writer_unlock,  (void)0, (mutex))
 # define g_rw_mutex_free(mutex)						\
     G_THREAD2_CF (rw_mutex_free,          (void)0, (mutex))
 
@@ -237,18 +237,18 @@ GMutex* g_static_mutex_get_mutex_impl   (GMutex **mutex);
         g_thread_functions_for_glib_use.cond_timed_wait)		\
           (cond, mutex, abs_time, G_MUTEX_DEBUG_MAGIC, G_STRLOC) : TRUE)
 
-# define g_rw_mutex_read_lock(mutex)					\
-    G_THREAD2_ECF (rw_mutex_read_lock,     (void)0, (mutex), void)
-# define g_rw_mutex_read_trylock(mutex)					\
-    G_THREAD2_ECF (rw_mutex_read_trylock,  TRUE,    (mutex), gboolean)
-# define g_rw_mutex_read_unlock(mutex)					\
-    G_THREAD2_ECF (rw_mutex_read_unlock,   (void)0, (mutex), void)
-# define g_rw_mutex_write_lock(mutex)					\
-    G_THREAD2_ECF (rw_mutex_write_lock,    (void)0, (mutex), void)
-# define g_rw_mutex_write_trylock(mutex)				\
-    G_THREAD2_ECF (rw_mutex_write_trylock, TRUE,    (mutex), gboolean)
-# define g_rw_mutex_write_unlock(mutex)					\
-    G_THREAD2_ECF (rw_mutex_write_unlock,  (void)0, (mutex), void)
+# define g_rw_mutex_reader_lock(mutex)					\
+    G_THREAD2_ECF (rw_mutex_reader_lock,     (void)0, (mutex), void)
+# define g_rw_mutex_reader_trylock(mutex)				\
+    G_THREAD2_ECF (rw_mutex_reader_trylock,  TRUE,    (mutex), gboolean)
+# define g_rw_mutex_reader_unlock(mutex)				\
+    G_THREAD2_ECF (rw_mutex_reader_unlock,   (void)0, (mutex), void)
+# define g_rw_mutex_writer_lock(mutex)					\
+    G_THREAD2_ECF (rw_mutex_writer_lock,    (void)0, (mutex), void)
+# define g_rw_mutex_writer_trylock(mutex)				\
+    G_THREAD2_ECF (rw_mutex_writer_trylock, TRUE,    (mutex), gboolean)
+# define g_rw_mutex_writer_unlock(mutex)				\
+    G_THREAD2_ECF (rw_mutex_writer_unlock,  (void)0, (mutex), void)
 # define g_rw_mutex_free(mutex)						\
     G_THREAD2_ECF (rw_mutex_free,          (void)0, (mutex), void)