From 184a35101f35ed73455f79a6d7645232a54b5272 Mon Sep 17 00:00:00 2001 From: Jay Krell Date: Wed, 11 Dec 2019 11:40:27 -0800 Subject: [PATCH] Make Socket.Socket_icall static, as most icalls are, removing the first, unused parameter. (mono/mono#18130) Also partial undo recent and append _icall to end. This is verbose, but maybe worthwhile to aid search. This is extracted from https://github.com/mono/mono/pull/17978. Commit migrated from https://github.com/mono/mono/commit/256eda8c7f1d4d18578388284aa224c7b22df75a --- src/mono/configure.ac | 2 +- src/mono/mono/metadata/icall-def.h | 2 +- src/mono/mono/metadata/w32socket.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mono/configure.ac b/src/mono/configure.ac index c22ade1..9e7be97 100644 --- a/src/mono/configure.ac +++ b/src/mono/configure.ac @@ -63,7 +63,7 @@ MONO_VERSION_BUILD=`echo $VERSION | cut -d . -f 3` # This line is parsed by tools besides autoconf, such as msvc/mono.winconfig.targets. # It should remain in the format they expect. # -MONO_CORLIB_VERSION=1a9706ca-e72f-45e5-b6b0-895656471c27 +MONO_CORLIB_VERSION=3bf09a16-d684-401b-ae3c-2015596b0194 # # Put a quoted #define in config.h. diff --git a/src/mono/mono/metadata/icall-def.h b/src/mono/mono/metadata/icall-def.h index 98a1270..272bf8c 100644 --- a/src/mono/mono/metadata/icall-def.h +++ b/src/mono/mono/metadata/icall-def.h @@ -559,7 +559,7 @@ HANDLES(SOCK_16a, "Send_array_icall", ves_icall_System_Net_Sockets_Socket_Send_a HANDLES(SOCK_17, "Send_icall", ves_icall_System_Net_Sockets_Socket_Send, gint32, 6, (gsize, char_ptr, gint32, gint32, gint32_ref, MonoBoolean)) HANDLES(SOCK_18, "SetSocketOption_icall", ves_icall_System_Net_Sockets_Socket_SetSocketOption, void, 7, (gsize, gint32, gint32, MonoObject, MonoArray, gint32, gint32_ref)) HANDLES(SOCK_19, "Shutdown_icall", ves_icall_System_Net_Sockets_Socket_Shutdown, void, 3, (gsize, gint32, gint32_ref)) -HANDLES(SOCK_20, "Socket_icall", ves_icall_System_Net_Sockets_Socket_Socket, gpointer, 5, (MonoObject, gint32, gint32, gint32, gint32_ref)) +HANDLES(SOCK_20, "Socket_icall", ves_icall_System_Net_Sockets_Socket_Socket_icall, gpointer, 4, (gint32, gint32, gint32, gint32_ref)) HANDLES(SOCK_20a, "SupportsPortReuse", ves_icall_System_Net_Sockets_Socket_SupportPortReuse, MonoBoolean, 1, (MonoProtocolType)) HANDLES(SOCK_21a, "cancel_blocking_socket_operation", ves_icall_cancel_blocking_socket_operation, void, 1, (MonoThreadObject)) diff --git a/src/mono/mono/metadata/w32socket.c b/src/mono/mono/metadata/w32socket.c index 460503f..287af35 100644 --- a/src/mono/mono/metadata/w32socket.c +++ b/src/mono/mono/metadata/w32socket.c @@ -743,7 +743,7 @@ get_socket_assembly (void) } gpointer -ves_icall_System_Net_Sockets_Socket_Socket (MonoObjectHandle this_obj, gint32 family, gint32 type, gint32 proto, gint32 *werror, MonoError *error) +ves_icall_System_Net_Sockets_Socket_Socket_icall (gint32 family, gint32 type, gint32 proto, gint32 *werror, MonoError *error) { SOCKET sock; gint32 sock_family; -- 2.7.4