--- rxvt-unicode/src/ptytty.h	2006/01/17 12:22:59	1.10
+++ rxvt-unicode/src/ptytty.h	2006/01/22 00:48:13	1.18
@@ -1,24 +1,20 @@
 #ifndef PTYTTY_H
 #define PTYTTY_H
 
-#include "rxvt.h"
-#include "feature.h"
+#include "libptytty.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__)
+#include "ptytty_conf.h"
+
+#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(UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) || defined(__GLIBC__)
 #  undef HAVE_UTMPX_H
 #  undef HAVE_STRUCT_UTMPX
 # endif
-# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
+# if !defined(UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
 #  undef HAVE_UTMP_H
 #  undef HAVE_STRUCT_UTMP
 # endif
@@ -40,7 +36,7 @@
 
 # include <pwd.h>
 
-# ifdef RXVT_UTMP_SYSV
+# ifdef UTMP_SYSV
 #  ifndef USER_PROCESS
 #   define USER_PROCESS		7
 #  endif
@@ -51,20 +47,19 @@
 
 #endif
 
-struct rxvt_ptytty_unix : rxvt_ptytty {
+struct ptytty_unix : 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 ();
+  ptytty_unix ();
+  ~ptytty_unix ();
+
+  bool get ();
+  void put ();
+
+  void login (int cmd_pid, bool login_shell, const char *hostname);
 
 #if UTMP_SUPPORT
   int utmp_pos;
@@ -81,10 +76,6 @@
   char ut_id[5];
 #endif
 
-  bool get ();
-  void put ();
-
-  void login (int cmd_pid, bool login_shell, const char *hostname);
   void logout ();
 #endif
 };