From: root <root>
Date: Tue, 17 Jan 2006 10:59:32 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=da987f6e2fa5175ab9c508b2473e03da795f6f6e;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/logging.C b/src/logging.C
index 733884c0..d3f00917 100644
--- a/src/logging.C
+++ b/src/logging.C
@@ -57,7 +57,7 @@ static void             rxvt_update_lastlog              (const char *fname, con
  * make and write utmp and wtmp entries
  */
 void
-rxvt_ptytty::login (int cmd_pid, bool login_shell, const char *hostname)
+rxvt_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
 {
   const char *pty = name;
 
@@ -227,7 +227,7 @@ rxvt_ptytty::login (int cmd_pid, bool login_shell, const char *hostname)
  * remove utmp and wtmp entries
  */
 void
-rxvt_ptytty::logout ()
+rxvt_ptytty_unix::logout ()
 {
   if (!cmd_pid)
     return;
diff --git a/src/ptytty.C b/src/ptytty.C
index 68b25cdd..e58641e8 100644
--- a/src/ptytty.C
+++ b/src/ptytty.C
@@ -224,7 +224,6 @@ get_tty (char *ttydev)
 static int
 control_tty (int fd_tty)
 {
-#ifndef __QNX__
   int fd;
 
   /* ---------------------------------------- */
@@ -288,7 +287,6 @@ control_tty (int fd_tty)
     return -1;		/* fatal */
   close (fd);
   /* ---------------------------------------- */
-#endif				/* ! __QNX__ */
 
   return 0;
 }
diff --git a/src/ptytty.h b/src/ptytty.h
index 75b419e5..8bbbba3f 100644
--- a/src/ptytty.h
+++ b/src/ptytty.h
@@ -48,11 +48,6 @@
 #  endif
 # endif
 
-# ifdef __QNX__
-#  include <sys/utsname.h>
-#  define ut_name		ut_user
-# endif
-
 #endif
 
 enum rxvt_privaction { IGNORE = 'i', SAVE = 's', RESTORE = 'r' };
diff --git a/src/rxvt.h b/src/rxvt.h
index aa12f09e..3d43eb0c 100644
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1124,7 +1124,7 @@ struct rxvt_term : zero_initialized, rxvt_vars {
   char           *cmdbuf_ptr, *cmdbuf_endp;
   char            cmdbuf_base[CBUFSIZ];
 
-  rxvt_ptytty     pty;
+  rxvt_ptytty_unix pty;
 
   rxvt_salloc    *talloc;             // text line allocator
   rxvt_salloc    *ralloc;             // rend line allocator