--- grp.cc.orig	2012-02-03 12:35:27.128043300 +0100
+++ grp.cc	2012-02-03 12:37:53.674696500 +0100
@@ -32,7 +32,7 @@ static char * NO_COPY null_ptr;
 bool
 pwdgrp::parse_group ()
 {
-# define grp (*group_buf)[curr_lines]
+  __group32 & grp = (*group_buf)[curr_lines];
   grp.gr_name = next_str (':');
   if (!*grp.gr_name)
     return false;
@@ -60,7 +60,6 @@ pwdgrp::parse_group ()
     }
 
   return true;
-# undef grp
 }
 
 /* Cygwin internal */