Changeset a902ebb for logging.c

Timestamp:

Oct 29, 2012, 11:19:40 PM (12 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

9b3167b (diff), 0792d99 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 0792d99eb4637636b607b9c1579c0b5e97de6a20 into 9b3167b9c2d41734807e20045328812b089538e5

File:

• logging.c (modified) (2 diffs)

logging.c

@@ -436 +436 @@
 void owl_log_init(void) 
 {
+  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;
-  log_context = g_main_context_new();
   logging_thread = g_thread_create(owl_log_thread_func,
                                    NULL,
@@ -448 +453 @@
     exit(1);
   }
+#endif
   
 }