--- rxvt-unicode/src/ptytty.C	2007/12/11 21:49:12	1.68
+++ rxvt-unicode/src/ptytty.C	2011/02/21 07:41:02	1.71
@@ -7,7 +7,7 @@
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
- * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
  * Copyright (c) 2006      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *---------------------------------------------------------------------*/
 
-#include "../config.h"
+#include "config.h"
 
 #include "ptytty.h"
 
@@ -34,6 +34,7 @@
 #include <csignal>
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 
@@ -43,7 +44,7 @@
 #if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
 # include <sys/stropts.h>      /* for I_PUSH */
 #endif
-#ifdef HAVE_ISASTREAM
+#if defined(HAVE_ISASTREAM) && defined(HAVE_STROPTS_H)
 # include <stropts.h>
 #endif
 #if defined(HAVE_PTY_H)
@@ -129,40 +130,9 @@
 
     slave = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
 
-    if (slave != NULL) {
-      *ttydev = strdup (slave);
-      return pfd;
-    }
-
-    return -1;
-  }
-
-#elif defined(HAVE_DEV_PTC)
-
-  static int
-  get_pty (int *fd_tty, char **ttydev)
-  {
-    int pfd;
-
-    if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
-      {
-        *ttydev = strdup (ttyname (pfd));
-        return pfd;
-      }
-
-    return -1;
-  }
-
-#elif defined(HAVE_DEV_CLONE)
-
-  static int
-  get_pty (int *fd_tty, char **ttydev)
-  {
-    int pfd;
-
-    if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
+    if (slave != NULL)
       {
-        *ttydev = strdup (ptsname (pfd));
+        *ttydev = strdup (slave);
         return pfd;
       }
 
@@ -248,7 +218,7 @@
    * close () - on the master side which causes a hang up to be sent
    * through - Geoff Wing
    */
-# ifdef HAVE_ISASTREAM
+#if defined(HAVE_ISASTREAM) && defined(HAVE_STROPTS_H)
   if (isastream (fd_tty) == 1)
 # endif
     {