--- rxvt-unicode/src/ptytty.h	2006/01/17 11:02:10	1.9
+++ rxvt-unicode/src/ptytty.h	2006/01/17 16:50:42	1.13
@@ -1,6 +1,7 @@
 #ifndef PTYTTY_H
 #define PTYTTY_H
 
+#include "rxvt.h"
 #include "feature.h"
 
 #if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
@@ -50,30 +51,8 @@
 
 #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
@@ -88,6 +67,9 @@
   rxvt_ptytty_unix ();
   ~rxvt_ptytty_unix ();
 
+  bool get ();
+  void put ();
+
 #if UTMP_SUPPORT
   int utmp_pos;
   int cmd_pid;
@@ -103,9 +85,6 @@
   char ut_id[5];
 #endif
 
-  bool get ();
-  void put ();
-
   void login (int cmd_pid, bool login_shell, const char *hostname);
   void logout ();
 #endif