diff options
| author | nagachika <nagachika@ruby-lang.org> | 2020-12-31 15:37:15 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2020-12-31 15:37:15 +0900 |
| commit | 16930b254b4e5397759d6b42845b495041b71321 (patch) | |
| tree | 591898aba65f302c055903d2ee6b9424891fe966 | |
| parent | 27fca66207f2c35f2f44f6a7cbbe6fd153546082 (diff) | |
| download | ruby-16930b254b4e5397759d6b42845b495041b71321.tar.gz | |
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]
| -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 6766df26f4..208208d0ff 100644 --- a/configure.ac +++ b/configure.ac @@ -2410,11 +2410,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([ @@ -2,7 +2,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 142 +#define RUBY_PATCHLEVEL 143 #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 12 |