Changeset cb124fc6

Timestamp:

Oct 29, 2012, 11:04:56 PM (9 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master

Children:

0792d99

Parents:

c748e8a

git-author:

Anders Kaseorg <andersk@mit.edu> (06/26/12 01:57:33)

git-committer:

Anders Kaseorg <andersk@mit.edu> (10/29/12 23:04:56)

Message:

Replace deprecated GLib < 2.31.0 mutex APIs

As of GLib 2.31.0,
 - GMutex and GCond can now be statically allocated without explicit
   initialisation.  Dynamic allocation for these types is deprecated.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• global.c (modified) (2 diffs)
• owl.h (modified) (1 diff)

global.c

@@ -100 +100 @@
 
   g->interrupt_count = 0;
+#if GLIB_CHECK_VERSION(2, 31, 0)
+  g_mutex_init(&g->interrupt_lock);
+#else
   g->interrupt_lock = g_mutex_new();
+#endif
 }
 
@@ -901 +905 @@
 static GMutex *owl_global_get_interrupt_lock(owl_global *g)
 {
+#if GLIB_CHECK_VERSION(2, 31, 0)
+  return &g->interrupt_lock;
+#else
   return g->interrupt_lock;
+#endif
 }
 

owl.h

@@ -596 +596 @@
   char *kill_buffer;
   int interrupt_count;
+#if GLIB_CHECK_VERSION(2, 31, 0)
+  GMutex interrupt_lock;
+#else
   GMutex *interrupt_lock;
+#endif
 } owl_global;