luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-12 12:14:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

gmain: fix some win32 build errors

Browse Source
This commit is contained in:
Ryan Lortie
2011-09-17 17:32:18 -04:00
parent 928ce3e5ef
commit f202946146
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
glib/gmain.c
View File

@@ -4028,7 +4028,6 @@ g_child_watch_prepare (GSource *source,
return FALSE; return FALSE;
} }
static gboolean static gboolean
g_child_watch_check (GSource *source) g_child_watch_check (GSource *source)
{ {
@@ -4064,6 +4063,11 @@ g_child_watch_check (GSource *source)
return child_exited; return child_exited;
} }
static void
g_child_watch_finalize (GSource *source)
{
}
#else /* G_OS_WIN32 */ #else /* G_OS_WIN32 */
static void static void
@@ -4283,8 +4287,6 @@ g_unix_signal_watch_finalize (GSource *source)
G_UNLOCK (unix_signal_lock); G_UNLOCK (unix_signal_lock);
} }
#endif /* G_OS_WIN32 */
static void static void
g_child_watch_finalize (GSource *source) g_child_watch_finalize (GSource *source)
{ {
@@ -4293,6 +4295,8 @@ g_child_watch_finalize (GSource *source)
G_UNLOCK (unix_signal_lock); G_UNLOCK (unix_signal_lock);
} }
#endif /* G_OS_WIN32 */
static gboolean static gboolean
g_child_watch_dispatch (GSource *source, g_child_watch_dispatch (GSource *source,
GSourceFunc callback, GSourceFunc callback,
@@ -4733,8 +4737,10 @@ glib_worker_main (gpointer data)
{ {
g_main_context_iteration (glib_worker_context, TRUE); g_main_context_iteration (glib_worker_context, TRUE);
#ifdef G_OS_UNIX
if (any_unix_signal_pending) if (any_unix_signal_pending)
dispatch_unix_signals (); dispatch_unix_signals ();
#endif
} }
return NULL; /* worst GCC warning message ever... */ return NULL; /* worst GCC warning message ever... */