mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-26 20:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge revision(s) d77e02bd85ab7f841df8d473bac214b9a92a3506: [Backport #21497]

Browse Source 
[Bug #21497] [ruby/socket]: add full prototype
	MIME-Version: 1.0
	Content-Type: text/plain; charset=UTF-8
	Content-Transfer-Encoding: 8bit

	otherwise, gcc 15 will complain:

	> init.c:573:19: error: too many arguments to function ‘Rconnect’; expected 0, have 3
	>   573 |     return (VALUE)Rconnect(arg->fd, arg->sockaddr, arg->len);
	>       |                   ^~~~~~~~ ~~~~~~~
	> In file included from init.c:11:
	> rubysocket.h:294:5: note: declared here
	>   294 | int Rconnect();
	>       |     ^~~~~~~~

	> sockssocket.c:33:9: error: too many arguments to function ‘SOCKSinit’; expected 0, have 1
	>    33 |         SOCKSinit("ruby");
	>       |         ^~~~~~~~~ ~~~~~~
	> In file included from sockssocket.c:11:
	> rubysocket.h:293:6: note: declared here
	>   293 | void SOCKSinit();
	>       |      ^~~~~~~~~

	Signed-off-by: Z. Liu <zhixu.liu@gmail.com>
This commit is contained in:
Takashi Kokubun 2025-07-14 14:48:27 -07:00
parent 02744e58f3
commit 782aef10bb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/socket/rubysocket.h
View File

@ -292,8 +292,8 @@ extern VALUE rb_eResolution;
#ifdef SOCKS
extern VALUE rb_cSOCKSSocket;
# ifndef SOCKS5
void SOCKSinit();
int Rconnect();
void SOCKSinit(char *);
int Rconnect(int, const struct sockaddr *, socklen_t);
# endif
#endif

2
version.h
View File

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 4
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 49
#define RUBY_PATCHLEVEL 50
#include "ruby/version.h"
#include "ruby/internal/abi.h"