Changes in / [a902ebb:9b3167b]

Files:

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

global.c

@@ -10 +10 @@
 
   g_type_init();
-#if !GLIB_CHECK_VERSION(2, 31, 0)
   g_thread_init(NULL);
-#endif
 
   owl_select_init();
@@ -102 +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
 }
 
@@ -905 +899 @@
 }
 
-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(owl_global_get_interrupt_lock(g));
+  g_mutex_lock(g->interrupt_lock);
   g->interrupt_count++;
-  g_mutex_unlock(owl_global_get_interrupt_lock(g));
+  g_mutex_unlock(g->interrupt_lock);
 }
 
 bool owl_global_take_interrupt(owl_global *g) {
   bool ans = false;
-  g_mutex_lock(owl_global_get_interrupt_lock(g));
+  g_mutex_lock(g->interrupt_lock);
   if (g->interrupt_count > 0) {
     ans = true;
     g->interrupt_count--;
   }
-  g_mutex_unlock(owl_global_get_interrupt_lock(g));
+  g_mutex_unlock(g->interrupt_lock);
   return ans;
 }

logging.c

@@ -436 +436 @@
 void owl_log_init(void) 
 {
+  GError *error = NULL;
   log_context = g_main_context_new();
-#if GLIB_CHECK_VERSION(2, 31, 0)
-  logging_thread = g_thread_new("logging",
-                                owl_log_thread_func,
-                                NULL);
-#else
-  GError *error = NULL;
   logging_thread = g_thread_create(owl_log_thread_func,
                                    NULL,
@@ -453 +448 @@
     exit(1);
   }
-#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;