8000 [Bug 20151] Fix build failure of FreeBSD 14.x by hsbt · Pull Request #10814 · ruby/ruby · GitHub
[go: up one dir, main page]
Skip to content

[Bug 20151] Fix build failure of FreeBSD 14.x #10814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 21, 2024
Merged

[Bug 20151] Fix build failure of FreeBSD 14.x #10814

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df1c814
merge revision(s) 7400628cb054a9a9651d69411a100fc9d518099f:
hsbt May 21, 2024
8e8a637
merge revision(s) ed3d8f74ec2eee43d50f9826e2f11ceea279823e:
hsbt May 21, 2024
15bda28
merge revision(s) cfc564ac40496a392f463658ea33954ea76d6b11:
hsbt May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
merge revision(s) cfc564a: 
	Include headers for `ruby_qsort` only if needed

	If GNU `qsort_r` is available, we use the function and these headers
	are not used.
	---
	 util.c | 4 ++--
	 1 file changed, 2 insertions(+), 2 deletions(-)
  • Loading branch information
@hsbt
hsbt committed May 21, 2024
commit 15bda28d9e12c85a1145d2fe8085da90db0ebbbe
4 changes: 2 additions & 2 deletions util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,15 @@ ruby_strtoul(const char *str, char **endptr, int base)
}
}

#if !defined HAVE_GNU_QSORT_R
#include <sys/types.h>
#include <sys/stat.h>
#include <stdint.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

typedef int (cmpfunc_t)(const void*, const void*, void*);

#if !defined HAVE_GNU_QSORT_R
#if defined HAVE_QSORT_S && defined RUBY_MSVCRT_VERSION
/* In contrast to its name, Visual Studio qsort_s is incompatible with
* C11 in the order of the comparison function's arguments, and same
Expand Down
2 changes: 1 addition & 1 deletion version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 254
#define RUBY_PATCHLEVEL 255

#define RUBY_RELEASE_YEAR 2024
#define RUBY_RELEASE_MONTH 5
Expand Down
0