diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-06 09:49:16 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-06 09:49:16 +0000 |
| commit | ce5590fc9f6d9ad728b0592a18311022807e61d4 (patch) | |
| tree | cf77b154262c1731fad89629cbb64915e74d724f | |
| parent | e0005fdc2734871c4acd7dcf269e1566388794c4 (diff) | |
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_6@67184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/pty/pty.c | 2 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 10eb0ac312..7b9df4b5b9 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -247,7 +247,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, int masterfd = -1, slavefd = -1; char *slavedevice; -#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,6 +1,6 @@ #define RUBY_VERSION "2.6.1" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 39 +#define RUBY_PATCHLEVEL 40 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 3 |