cf81029c01
Fixes the build failure visible at http://autobuild.buildroot.net/results/3d3/3d3f4f0044a4b58ce3d0a3449a5f012d953d59bb Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
29 lines
952 B
Diff
29 lines
952 B
Diff
Fix gio/gcancellable.c build when thread support is disabled
|
|
|
|
Signed-off-by: "Samuel Martin" <s.martin49@gmail.com>
|
|
---
|
|
--- a/gio/gcancellable.c 2013-05-14 23:08:25.514461348 +0200
|
|
+++ b/gio/gcancellable.c 2013-05-14 23:10:23.347789625 +0200
|
|
@@ -270,8 +270,10 @@ g_cancellable_reset (GCancellable *cance
|
|
while (priv->cancelled_running)
|
|
{
|
|
priv->cancelled_running_waiting = TRUE;
|
|
+#if defined(G_THREADS_ENABLED)
|
|
g_cond_wait (cancellable_cond,
|
|
g_static_mutex_get_mutex (& G_LOCK_NAME (cancellable)));
|
|
+#endif
|
|
}
|
|
|
|
if (priv->cancelled)
|
|
@@ -619,8 +621,10 @@ g_cancellable_disconnect (GCancellable
|
|
while (priv->cancelled_running)
|
|
{
|
|
priv->cancelled_running_waiting = TRUE;
|
|
+#if defined(G_THREADS_ENABLED)
|
|
g_cond_wait (cancellable_cond,
|
|
g_static_mutex_get_mutex (& G_LOCK_NAME (cancellable)));
|
|
+#endif
|
|
}
|
|
|
|
g_signal_handler_disconnect (cancellable, handler_id);
|