[glib] GCancellable: Fix build on Win32
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] GCancellable: Fix build on Win32
- Date: Tue, 28 Jun 2011 16:52:57 +0000 (UTC)
commit 315210ecdb98bc8effe6524ee24baba39cd48056
Author: Colin Walters <walters verbum org>
Date: Tue Jun 28 12:52:58 2011 -0400
GCancellable: Fix build on Win32
https://bugzilla.gnome.org/show_bug.cgi?id=653522
gio/gcancellable.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/gio/gcancellable.c b/gio/gcancellable.c
index f34761c..40185f7 100644
--- a/gio/gcancellable.c
+++ b/gio/gcancellable.c
@@ -195,17 +195,20 @@ g_cancellable_class_init (GCancellableClass *klass)
}
-#ifndef G_OS_WIN32
-
static void
g_cancellable_write_cancelled (GCancellable *cancellable)
{
+#ifdef G_OS_WIN32
+ if (priv->event)
+ SetEvent (priv->event);
+#else
gssize c;
GCancellablePrivate *priv;
const char ch = 'x';
priv = cancellable->priv;
+
if (priv->cancel_pipe[0] == -1)
return;
@@ -227,8 +230,11 @@ g_cancellable_write_cancelled (GCancellable *cancellable)
do
c = write (priv->cancel_pipe[1], &ch, 1);
while (c == -1 && errno == EINTR);
+#endif
}
+#ifndef G_OS_WIN32
+
static void
g_cancellable_open_pipe (GCancellable *cancellable)
{
@@ -654,10 +660,6 @@ g_cancellable_cancel (GCancellable *cancellable)
priv->cancelled = TRUE;
priv->cancelled_running = TRUE;
-#ifdef G_OS_WIN32
- if (priv->event)
- SetEvent (priv->event);
-#endif
g_cancellable_write_cancelled (cancellable);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]