--- rxvt-unicode/src/logging.C	2005/02/16 21:37:10	1.16
+++ rxvt-unicode/src/logging.C	2006/01/13 07:03:48	1.20
@@ -39,9 +39,10 @@
  *	rxvt_update_wtmp ();
  *----------------------------------------------------------------------*/
 
-#include "../config.h"		/* NECESSARY */
-#include "rxvt.h"		/* NECESSARY */
+#include "../config.h"
+#include "rxvt.h"
 #include "logging.h"
+
 #ifdef UTMP_SUPPORT
 
 #if HAVE_STRUCT_UTMP
@@ -75,7 +76,7 @@
 #ifdef HAVE_UTMP_PID
   int i;
 #endif
-  struct passwd  *pwent = getpwuid (getuid ());
+  struct passwd *pwent = getpwuid (getuid ());
 
   if (!strncmp (pty, "/dev/", 5))
     pty += 5;		/* skip /dev/ prefix */
@@ -178,7 +179,7 @@
 
     if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
       {
-        char            buf[256], name[256];
+        char buf[256], name[256];
 
         buf[sizeof (buf) - 1] = '\0';
         for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
@@ -204,7 +205,7 @@
 
 #ifdef WTMP_SUPPORT
 # ifdef WTMP_ONLY_ON_LOGIN
-  if (options & Opt_loginShell)
+  if (OPTION (Opt_loginShell))
 # endif
     {
 # ifdef HAVE_STRUCT_UTMP
@@ -224,7 +225,7 @@
     }
 #endif
 #if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
-  if (options & Opt_loginShell)
+  if (OPTION (Opt_loginShell))
     rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
 #endif
 }
@@ -285,7 +286,7 @@
    */
 #ifdef WTMP_SUPPORT
 # ifdef WTMP_ONLY_ON_LOGIN
-  if (options & Opt_loginShell)
+  if (OPTION (Opt_loginShell))
 # endif
     {
 # ifdef HAVE_STRUCT_UTMP