luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-15 23:07:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-728-socket-flags-glib-2-60' into 'glib-2-60'

Browse Source 
Backport !728 “gsocket: Remove (type) annotation from flags arguments” to glib-2-60

See merge request GNOME/glib!729
This commit is contained in:
Sebastian Dröge 2019-03-15 11:40:27 +00:00
commit f79f7341a0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/gsocket.c
View File

@ -4540,7 +4540,7 @@ input_message_from_msghdr (const struct msghdr *msg,
* @messages: (array length=num_messages) (nullable): a pointer to an
* array of #GSocketControlMessages, or %NULL.
* @num_messages: number of elements in @messages, or -1.
* @flags: (type GSocketMsgFlags): an int containing #GSocketMsgFlags flags
* @flags: an int containing #GSocketMsgFlags flags
* @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
@ -4629,7 +4629,7 @@ g_socket_send_message (GSocket *socket,
* @messages: (array length=num_messages) (nullable): a pointer to an
* array of #GSocketControlMessages, or %NULL.
* @num_messages: number of elements in @messages, or -1.
* @flags: (type GSocketMsgFlags): an int containing #GSocketMsgFlags flags
* @flags: an int containing #GSocketMsgFlags flags
* @timeout_us: the maximum time (in microseconds) to wait, or -1
* @bytes_written: (out) (optional): location to store the number of bytes that were written to the socket
* @cancellable: (nullable): a %GCancellable or %NULL
@ -4862,7 +4862,7 @@ g_socket_send_message_with_timeout (GSocket *socket,
* @socket: a #GSocket
* @messages: (array length=num_messages): an array of #GOutputMessage structs
* @num_messages: the number of elements in @messages
* @flags: (type GSocketMsgFlags): an int containing #GSocketMsgFlags flags
* @flags: an int containing #GSocketMsgFlags flags
* @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
@ -5362,7 +5362,7 @@ g_socket_receive_message_with_timeout (GSocket *socket,
* @socket: a #GSocket
* @messages: (array length=num_messages): an array of #GInputMessage structs
* @num_messages: the number of elements in @messages
* @flags: (type GSocketMsgFlags): an int containing #GSocketMsgFlags flags for the overall operation
* @flags: an int containing #GSocketMsgFlags flags for the overall operation
* @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore
*
@ -5648,7 +5648,7 @@ g_socket_receive_messages_with_timeout (GSocket *socket,
* which may be filled with an array of #GSocketControlMessages, or %NULL
* @num_messages: (out): a pointer which will be filled with the number of
* elements in @messages, or %NULL
* @flags: (type GSocketMsgFlags) (inout): a pointer to an int containing #GSocketMsgFlags flags
* @flags: (inout): a pointer to an int containing #GSocketMsgFlags flags
* @cancellable: a %GCancellable or %NULL
* @error: a #GError pointer, or %NULL
*