GCancellable: Make eventfd() fall back to pipes on EINVAL too

https://bugzilla.gnome.org/show_bug.cgi?id=654232

diff --git a/gio/gcancellable.c b/gio/gcancellable.c
index f5cfdd90e515c404034520bfc5385f54fa0a5336..29746638cd90495c37dd37764e4f957105dae1ac 100644 (file)
--- a/gio/gcancellable.c
+++ b/gio/gcancellable.c
@@ -249,9 +249,11 @@ g_cancellable_open_pipe (GCancellable *cancellable)
        g_cancellable_write_cancelled (cancellable);
       return;
     }
        g_cancellable_write_cancelled (cancellable);
       return;
     }

-  else if (errno != ENOSYS)
-    return;
-  /* Fall through on ENOSYS */
+  else if (!(errno == ENOSYS || errno == EINVAL))
+    {
+      return;
+    }
+  /* Fall through on ENOSYS or EINVAL */

 #endif
   if (g_unix_open_pipe (priv->cancel_pipe, FD_CLOEXEC, NULL))
     {
 #endif
   if (g_unix_open_pipe (priv->cancel_pipe, FD_CLOEXEC, NULL))
     {