diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2021-04-04 23:30:49 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2021-04-04 23:30:49 +0000 |
| commit | 245a5e528525071200901047a9c8ecf9e4d5ca39 (patch) | |
| tree | 8149a7f9572c6306363ba66c951ce2b0e0925858 | |
| parent | 56f6c15dabadbb5d4cc0ba90ea3ee69210400511 (diff) | |
merge revision(s) be9dbe1c3eb4bb4cab0bdc42a91ef425bb1eaddd: [Backport #15178]
Fix pthread_setname_np arguments on NetBSD
The previous attempt to fix this in
b87df1bf243074edb2e6cc8a24bc00df81cebf3c reversed the argument
order instead of just fixing the quote escaping.
From Takahiro Kambe.
Fixes [Bug #15178]
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index d8103cbe8a..f849a65c1b 100644 --- a/configure.ac +++ b/configure.ac @@ -2404,11 +2404,11 @@ AS_IF([test x"$enable_pthread" = xyes], [ AC_CACHE_CHECK([arguments of pthread_setname_np], [rb_cv_func_pthread_setname_np_arguments], [rb_cv_func_pthread_setname_np_arguments= # Linux,AIX, (pthread_self(), name) - # NetBSD (pthread_self(), name, \"%s\") + # NetBSD (pthread_self(), \"%s\", name) # Darwin (name) for mac in \ "(pthread_self(), name)" \ - "(pthread_self(), name, \"%s\")" \ + "(pthread_self(), \"%s\", name)" \ "(name)" \ ; do AC_TRY_COMPILE([ @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.7" #define RUBY_RELEASE_DATE "2021-04-05" -#define RUBY_PATCHLEVEL 182 +#define RUBY_PATCHLEVEL 183 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 4 |