yugui	2008-12-19 20:37:16 +0900 (Fri, 19 Dec 2008)

  New Revision: 20877

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20877

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/pty/extconf.rb
    branches/ruby_1_9_1/ext/pty/pty.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20876)
+++ ruby_1_9_1/ChangeLog	(revision 20877)
@@ -1,3 +1,9 @@
+Wed Dec 17 19:37:30 2008  Tanaka Akira  <akr@f...>
+
+	* 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@r...>
 
 	* lib/matrix.rb: shut up warning. [ruby-dev:37481] [Bug #899]
Index: ruby_1_9_1/ext/pty/extconf.rb
===================================================================
--- ruby_1_9_1/ext/pty/extconf.rb	(revision 20876)
+++ ruby_1_9_1/ext/pty/extconf.rb	(revision 20877)
@@ -4,6 +4,7 @@
   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
Index: ruby_1_9_1/ext/pty/pty.c
===================================================================
--- ruby_1_9_1/ext/pty/pty.c	(revision 20876)
+++ ruby_1_9_1/ext/pty/pty.c	(revision 20877)
@@ -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 @@
 	rb_gc();
 	get_device_once(master, slave, SlaveName, 1);
     }
+    return Qnil;
 }
 
 /* ruby function: getpty */

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/