luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'socket.win32' into 'master'

Browse Source 
Win32: gio/gsocket.c: Set WSAEWOULDBLOCK on G_POLLABLE_RETURN_WOULD_BLOCK

See merge request GNOME/glib!634
This commit is contained in:
Philip Withnall 2019-02-05 11:25:52 +00:00
commit 22c168d5b7
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gio/gsocket.c
View File

@ -4609,7 +4609,13 @@ g_socket_send_message (GSocket *socket,
cancellable, error); cancellable, error);
if (res == G_POLLABLE_RETURN_WOULD_BLOCK) if (res == G_POLLABLE_RETURN_WOULD_BLOCK)
socket_set_error_lazy (error, EWOULDBLOCK, _("Error sending message: %s")); {
#ifndef G_OS_WIN32
socket_set_error_lazy (error, EWOULDBLOCK, _("Error sending message: %s"));
#else
socket_set_error_lazy (error, WSAEWOULDBLOCK, _("Error sending message: %s"));
#endif
}
return res == G_POLLABLE_RETURN_OK ? bytes_written : -1; return res == G_POLLABLE_RETURN_OK ? bytes_written : -1;
} }
@ -5056,7 +5062,13 @@ g_socket_send_messages_with_timeout (GSocket *socket,
cancellable, &msg_error); cancellable, &msg_error);
if (pollable_result == G_POLLABLE_RETURN_WOULD_BLOCK) if (pollable_result == G_POLLABLE_RETURN_WOULD_BLOCK)
socket_set_error_lazy (&msg_error, EWOULDBLOCK, _("Error sending message: %s")); {
#ifndef G_OS_WIN32
socket_set_error_lazy (&msg_error, EWOULDBLOCK, _("Error sending message: %s"));
#else
socket_set_error_lazy (&msg_error, WSAEWOULDBLOCK, _("Error sending message: %s"));
#endif
}
result = pollable_result == G_POLLABLE_RETURN_OK ? bytes_written : -1; result = pollable_result == G_POLLABLE_RETURN_OK ? bytes_written : -1;