--- rxvt-unicode/src/ptytty.h	2006/01/17 15:17:39	1.12
+++ rxvt-unicode/src/ptytty.h	2006/01/21 18:15:17	1.16
@@ -4,17 +4,12 @@
 #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
@@ -55,18 +50,14 @@
 {
   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;
@@ -82,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