Changes in global.c [219f52c:0792d99]

File:

• global.c (modified) (3 diffs)

global.c

@@ -10 +10 @@
 
   g_type_init();
+#if !GLIB_CHECK_VERSION(2, 31, 0)
   g_thread_init(NULL);
+#endif
 
   owl_select_init();
@@ -100 +102 @@
 
   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
 }
 
@@ -899 +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
+}
+
 void owl_global_add_interrupt(owl_global *g) {
   /* TODO: This can almost certainly be done with atomic
    * operations. Whatever. */
-  g_mutex_lock(g->interrupt_lock);
+  g_mutex_lock(owl_global_get_interrupt_lock(g));
   g->interrupt_count++;
-  g_mutex_unlock(g->interrupt_lock);
+  g_mutex_unlock(owl_global_get_interrupt_lock(g));
 }
 
 bool owl_global_take_interrupt(owl_global *g) {
   bool ans = false;
-  g_mutex_lock(g->interrupt_lock);
+  g_mutex_lock(owl_global_get_interrupt_lock(g));
   if (g->interrupt_count > 0) {
     ans = true;
     g->interrupt_count--;
   }
-  g_mutex_unlock(g->interrupt_lock);
+  g_mutex_unlock(owl_global_get_interrupt_lock(g));
   return ans;
 }