mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merges r20846 from trunk into ruby_1_9_1 and filsters modification for
1.9.2 features. * ext/pty/extconf.rb: check util.h for OpenBSD. * ext/pty/pty.c: include util.h if available. fix variable name. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
fcca1f25cc
commit
b67d1000ae
3 changed files with 11 additions and 0 deletions
|
|
@ -1,3 +1,9 @@
|
|||
Wed Dec 17 19:37:30 2008 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/pty/extconf.rb: check util.h for OpenBSD.
|
||||
|
||||
* ext/pty/pty.c: include util.h if available.
|
||||
|
||||
Wed Dec 17 19:23:28 2008 Keiju Ishitsuka <keiju@ruby-lang.org>
|
||||
|
||||
* lib/matrix.rb: shut up warning. [ruby-dev:37481] [Bug #899]
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ if /mswin|mingw|bccwin/ !~ RUBY_PLATFORM
|
|||
have_header("sys/stropts.h")
|
||||
have_func("setresuid")
|
||||
have_header("libutil.h")
|
||||
have_header("util.h") # OpenBSD openpty
|
||||
have_header("pty.h")
|
||||
have_library("util", "openpty")
|
||||
if have_func("openpty") or
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@
|
|||
#ifdef HAVE_LIBUTIL_H
|
||||
#include <libutil.h>
|
||||
#endif
|
||||
#ifdef HAVE_UTIL_H
|
||||
#include <util.h>
|
||||
#endif
|
||||
#ifdef HAVE_PTY_H
|
||||
#include <pty.h>
|
||||
#endif
|
||||
|
|
@ -417,6 +420,7 @@ getDevice(int *master, int *slave, char SlaveName[DEVICELEN])
|
|||
rb_gc();
|
||||
get_device_once(master, slave, SlaveName, 1);
|
||||
}
|
||||
return Qnil;
|
||||
}
|
||||
|
||||
/* ruby function: getpty */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue