luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-26 02:48:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'win32-fd' into 'main'

Browse Source 
gio: various unix/fd-related enablement on win32

See merge request GNOME/glib!2656
This commit is contained in:
Philip Withnall
2022-05-18 14:01:43 +00:00
parent 0be6aa1b22 bb890b57d2
commit caf6d99fbe
10 changed files with 224 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gio/gdbusserver.c
View File

@@ -53,9 +53,7 @@
#include <io.h>
#endif
#ifdef G_OS_UNIX
#include "gunixsocketaddress.h"
#endif
#include "glibintl.h"
@@ -675,8 +673,6 @@ g_dbus_server_stop (GDBusServer *server)
/* ---------------------------------------------------------------------------------------------------- */
#ifdef G_OS_UNIX
static gint
random_ascii (void)
{
@@ -825,7 +821,6 @@ try_unix (GDBusServer *server,
}
return ret;
}
#endif
/* ---------------------------------------------------------------------------------------------------- */
@@ -1144,10 +1139,8 @@ initable_init (GInitable *initable,
if (FALSE)
{
}
#ifdef G_OS_UNIX
else if (g_strcmp0 (transport_name, "unix") == 0)
ret = try_unix (server, address_entry, key_value_pairs, &this_error);
#endif
else if (g_strcmp0 (transport_name, "tcp") == 0)
ret = try_tcp (server, address_entry, key_value_pairs, FALSE, &this_error);
else if (g_strcmp0 (transport_name, "nonce-tcp") == 0)