Fixes for compiling pty C-ext on linux.

rubinius · Aug 25, 2012 · 9bb0a65 · 9bb0a65
1 parent 5b0e570
commit 9bb0a65
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/19/pty/ext/extconf.rb b/lib/19/pty/ext/extconf.rb
@@ -5,6 +5,7 @@
   have_header("sys/wait.h")
   have_func("setresuid")
   have_header("libutil.h")
+  have_header("unistd.h")
   have_header("pty.h")
   have_library("util", "openpty")
   if have_func("openpty") or

diff --git a/lib/19/pty/ext/pty.c b/lib/19/pty/ext/pty.c
@@ -44,7 +44,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_OPENPTY
+#if defined(HAVE_OPENPTY) && !defined(HAVE_PTY_H)
 /* Normally, the following header would be used:
  * #include <util.h>
  *