diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-19 11:37:16 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-19 11:37:16 +0000 |
| commit | f1bdf822da2005490df9b8a30c9f9096ff468db9 (patch) | |
| tree | ac6f7640ce4cdc97fc40c214d0b30c53fb32df7a /ext/pty/pty.c | |
| parent | ccfb7f15fb7a634e5431b9fa0f83d6da6f0efd51 (diff) | |
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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/pty/pty.c')
| -rw-r--r-- | ext/pty/pty.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/pty/pty.c b/ext/pty/pty.c index ce805544f..fc06d2dd5 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -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 */ |