[glib: 2/2] Merge branch 'fix/unix-stream-pollable-detection' into 'master'

[Sebastian Dröge <sdroege src gnome org>]

commit e6f506a92c178c9e2a003d069ad57d0bfb771370
Merge: 94007bbcb d7ee70c01
Author: Sebastian Dröge <slomo coaxion net>
Date:   Tue Feb 2 10:46:52 2021 +0000

    Merge branch 'fix/unix-stream-pollable-detection' into 'master'
    
    gunix: Fix {Input,Output}Stream pollable detection
    
    Closes #1180
    
    See merge request GNOME/glib!1846

 gio/giounix-private.c   | 145 ++++++++++++++++++++++++++++++++++++++++++++++++
 gio/giounix-private.h   |  26 +++++++++
 gio/gunixinputstream.c  |  15 ++---
 gio/gunixoutputstream.c |  17 ++----
 gio/meson.build         |   1 +
 gio/tests/meson.build   |   2 +-
 gio/tests/pollable.c    | 107 +++++++++++++++++++++++++++++++----
 meson.build             |   1 +
 8 files changed, 282 insertions(+), 32 deletions(-)
---