--- passwd.cc.orig	2012-02-03 12:06:20.221370100 +0100
+++ passwd.cc	2012-02-03 12:11:33.891734000 +0100
@@ -31,7 +31,7 @@ static pwdgrp pr (passwd_buf);
 bool
 pwdgrp::parse_passwd ()
 {
-# define res (*passwd_buf)[curr_lines]
+  passwd & res = (*passwd_buf)[curr_lines];
   res.pw_name = next_str (':');
   res.pw_passwd = next_str (':');
   if (!next_num (res.pw_uid))
@@ -43,7 +43,6 @@ pwdgrp::parse_passwd ()
   res.pw_dir =  next_str (':');
   res.pw_shell = next_str (':');
   return true;
-# undef res
 }
 
 /* Read in /etc/passwd and save contents in the password cache.