From 2456db2c004d19cae0bca07a7de82feadc119b94 Mon Sep 17 00:00:00 2001
From: Dieter Verfaillie <dieterv@optionexplicit.be>
Date: Thu, 30 Jun 2011 09:32:32 -0400
Subject: [PATCH] GCancellable: Fix build on Win32

https://bugzilla.gnome.org/show_bug.cgi?id=653522
---
 gio/gcancellable.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gio/gcancellable.c b/gio/gcancellable.c
index 40185f7..f5cfdd9 100644
--- a/gio/gcancellable.c
+++ b/gio/gcancellable.c
@@ -198,16 +198,16 @@ g_cancellable_class_init (GCancellableClass *klass)
 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;
 
+#ifdef G_OS_WIN32
+  if (priv->event)
+    SetEvent (priv->event);
+#else
 
   if (priv->cancel_pipe[0] == -1)
     return;
@@ -225,12 +225,12 @@ g_cancellable_write_cancelled (GCancellable *cancellable)
 
       return;
     }
-#endif
+#endif /* HAVE_EVENTFD */
 
   do
     c = write (priv->cancel_pipe[1], &ch, 1);
   while (c == -1 && errno == EINTR);
-#endif
+#endif /* G_OS_WIN32 */
 }
 
 #ifndef G_OS_WIN32
-- 
2.7.4