mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-11 03:46:17 +01:00
gmain: fix some win32 build errors
This commit is contained in:
parent
928ce3e5ef
commit
f202946146
12
glib/gmain.c
12
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
|
||||
@ -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... */
|
||||
|
Loading…
Reference in New Issue
Block a user