diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-06 11:32:02 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-06 11:32:02 +0000 |
| commit | 80266bfb39984cd6f1b9c5fed790a738fcd54d16 (patch) | |
| tree | a086e69debf390e85683ae818b00180e1792b248 | |
| parent | 76ee1d849414321047fed683b81583bc2ab14d4c (diff) | |
| download | ruby-80266bfb39984cd6f1b9c5fed790a738fcd54d16.tar.gz | |
merge revision(s) 67183: [Backport #15607]
Fix PTY.open on OpenBSD [Bug #15607]
From: Jeremy Evans <code@jeremyevans.net>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/pty/pty.c | 2 | ||||
| -rw-r--r-- | version.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 7726f154eb..341dbbf88b 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -237,7 +237,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, dfl.sa_flags = 0; sigemptyset(&dfl.sa_mask); -#if defined(__sun) || (defined(__FreeBSD__) && __FreeBSD_version < 902000) +#if defined(__sun) || defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD_version < 902000) /* workaround for Solaris 10: grantpt() doesn't work if FD_CLOEXEC is set. [ruby-dev:44688] */ /* FreeBSD 9.2 or later supports O_CLOEXEC * http://www.freebsd.org/cgi/query-pr.cgi?pr=162374 */ @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.5.4" -#define RUBY_RELEASE_DATE "2019-02-11" -#define RUBY_PATCHLEVEL 140 +#define RUBY_RELEASE_DATE "2019-03-06" +#define RUBY_PATCHLEVEL 141 #define RUBY_RELEASE_YEAR 2019 -#define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_MONTH 3 +#define RUBY_RELEASE_DAY 6 #include "ruby/version.h" |