[glib] gmain: fix some win32 build errors
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gmain: fix some win32 build errors
- Date: Sat, 17 Sep 2011 21:34:05 +0000 (UTC)
commit f20294614616a4ae4fdfb34f1360354e6b2fbf27
Author: Ryan Lortie <desrt desrt ca>
Date: Sat Sep 17 17:32:18 2011 -0400
gmain: fix some win32 build errors
glib/gmain.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/glib/gmain.c b/glib/gmain.c
index aa2877e..f20603d 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -4028,7 +4028,6 @@ g_child_watch_prepare (GSource *source,
return FALSE;
}
-
static gboolean
g_child_watch_check (GSource *source)
{
@@ -4064,6 +4063,11 @@ g_child_watch_check (GSource *source)
return child_exited;
}
+static void
+g_child_watch_finalize (GSource *source)
+{
+}
+
#else /* G_OS_WIN32 */
static void
@@ -4275,7 +4279,7 @@ _g_main_create_unix_signal_watch (int signum)
return source;
}
-static void
+static void
g_unix_signal_watch_finalize (GSource *source)
{
G_LOCK (unix_signal_lock);
@@ -4283,8 +4287,6 @@ g_unix_signal_watch_finalize (GSource *source)
G_UNLOCK (unix_signal_lock);
}
-#endif /* G_OS_WIN32 */
-
static void
g_child_watch_finalize (GSource *source)
{
@@ -4293,6 +4295,8 @@ g_child_watch_finalize (GSource *source)
G_UNLOCK (unix_signal_lock);
}
+#endif /* G_OS_WIN32 */
+
static gboolean
g_child_watch_dispatch (GSource *source,
GSourceFunc callback,
@@ -4733,8 +4737,10 @@ glib_worker_main (gpointer data)
{
g_main_context_iteration (glib_worker_context, TRUE);
+#ifdef G_OS_UNIX
if (any_unix_signal_pending)
dispatch_unix_signals ();
+#endif
}
return NULL; /* worst GCC warning message ever... */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]