--- rxvt-unicode/src/ptytty.h	2006/01/17 10:14:26	1.6
+++ rxvt-unicode/src/ptytty.h	2006/01/19 16:40:13	1.15
@@ -1,19 +1,20 @@
 #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
-#if defined(__CYGWIN32__)
+#if defined(__CYGWIN__) || defined(PTYS_ARE_OPENPTY)
 # 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,39 +49,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_unix : rxvt_ptytty
+{
+  char *name;
 
-struct rxvt_ptytty {
-#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:
-  int pty; // pty file descriptor; connected to rxvt
-  int tty; // tty file descriptor; connected to child
-  char *name;
 
-  rxvt_ptytty ();
-  ~rxvt_ptytty ();
+  rxvt_ptytty_unix ();
+  ~rxvt_ptytty_unix ();
 
   bool get ();
   void put ();
 
-  void close_tty ();
-
-  bool make_controlling_tty ();
-  void set_utf8_mode (bool on);
-
 #if UTMP_SUPPORT
   int utmp_pos;
   int cmd_pid;