--- rxvt-unicode/src/ptytty.h	2006/01/17 10:59:32	1.8
+++ rxvt-unicode/src/ptytty.h	2006/01/21 18:15:17	1.16
@@ -1,19 +1,15 @@
 #ifndef PTYTTY_H
 #define PTYTTY_H
 
+#include "rxvt.h"
 #include "feature.h"
 
-#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
-# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
-#  define NO_SETOWNER_TTYDEV 1
-# endif
-#endif
-#if defined(__CYGWIN32__)
+#if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY) || defined(UNIX98_PTY)
 # define NO_SETOWNER_TTYDEV 1
 #endif
 
 #if UTMP_SUPPORT
-# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
+# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) || defined(__GLIBC__)
 #  undef HAVE_UTMPX_H
 #  undef HAVE_STRUCT_UTMPX
 # endif
@@ -48,51 +44,20 @@
 #  endif
 # endif
 
-# ifdef __QNX__
-#  include <sys/utsname.h>
-#  define ut_name		ut_user
-# endif
-
 #endif
 
-enum rxvt_privaction { IGNORE = 'i', SAVE = 's', RESTORE = 'r' };
-
-struct rxvt_ptytty {
-  int pty; // pty file descriptor; connected to rxvt
-  int tty; // tty file descriptor; connected to child
-
-  virtual ~rxvt_ptytty ()
-  {
-    //
-  }
-
-  virtual bool get () = 0;
-  virtual void put () = 0;
-
-  virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
-  virtual void logout () = 0;
-
-  void close_tty ();
-
-  bool make_controlling_tty ();
-  void set_utf8_mode (bool on);
-};
-
-struct rxvt_ptytty_unix : rxvt_ptytty {
+struct rxvt_ptytty_unix : rxvt_ptytty
+{
   char *name;
 
-#ifndef RESET_TTY_TO_COMMON_DEFAULTS
-  struct stat savestat; /* original status of our tty */
-#endif
-#ifndef NO_SETOWNER_TTYDEV
-  void privileges (rxvt_privaction action);
-  bool saved;
-#endif
 public:
 
   rxvt_ptytty_unix ();
   ~rxvt_ptytty_unix ();
 
+  bool get ();
+  void put ();
+
 #if UTMP_SUPPORT
   int utmp_pos;
   int cmd_pid;
@@ -108,9 +73,6 @@
   char ut_id[5];
 #endif
 
-  bool get ();
-  void put ();
-
   void login (int cmd_pid, bool login_shell, const char *hostname);
   void logout ();
 #endif