[glib: 12/12] Merge branch 'win32-socket' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit 9c9a26215d50f8af5c1d74d992d0a9b811eb5149
Merge: da2702646c 960ed2f906
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri May 13 10:25:23 2022 +0000

    Merge branch 'win32-socket' into 'main'
    
    Various socket-related fixes for win32
    
    See merge request GNOME/glib!2599

 gio/gio.h                                    |   3 +
 gio/tests/gdbus-peer.c                       |   5 +-
 gio/tests/socket.c                           |  56 ++++++++++++-
 gio/tests/unix-fd.c                          |   4 +-
 glib/glib-init.h                             |   3 +
 glib/glib-private.c                          |   2 +
 glib/glib-private.h                          |   7 ++
 glib/gspawn-win32-helper.c                   |  10 ++-
 glib/gspawn-win32.c                          |  26 +++---
 glib/gwin32.c                                | 118 +++++++++++++++++++++++++--
 glib/tests/meson.build                       |  11 ++-
 glib/tests/spawn-singlethread.c              |  53 ++++++++++++
 {tests => glib/tests}/spawn-test-win32-gui.c |   0
 meson.build                                  |   5 ++
 tests/meson.build                            |   6 --
 15 files changed, 272 insertions(+), 37 deletions(-)
---