--- rxvt-unicode/src/ptytty.h	2006/01/17 10:14:26	1.6
+++ rxvt-unicode/src/ptytty.h	2006/01/17 12:22:59	1.10
@@ -1,10 +1,11 @@
 #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_PTMX)
+# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
 #  define NO_SETOWNER_TTYDEV 1
 # endif
 #endif
@@ -48,16 +49,11 @@
 #  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_unix : rxvt_ptytty {
+  char *name;
 
-struct rxvt_ptytty {
 #ifndef RESET_TTY_TO_COMMON_DEFAULTS
   struct stat savestat; /* original status of our tty */
 #endif
@@ -66,20 +62,9 @@
   bool saved;
 #endif
 public:
-  int pty; // pty file descriptor; connected to rxvt
-  int tty; // tty file descriptor; connected to child
-  char *name;
-
-  rxvt_ptytty ();
-  ~rxvt_ptytty ();
-
-  bool get ();
-  void put ();
-
-  void close_tty ();
 
-  bool make_controlling_tty ();
-  void set_utf8_mode (bool on);
+  rxvt_ptytty_unix ();
+  ~rxvt_ptytty_unix ();
 
 #if UTMP_SUPPORT
   int utmp_pos;
@@ -96,6 +81,9 @@
   char ut_id[5];
 #endif
 
+  bool get ();
+  void put ();
+
   void login (int cmd_pid, bool login_shell, const char *hostname);
   void logout ();
 #endif