Re: user/4176: calendar file parsing

[Otto Moerbeek <otto_(_at_)_drijf_(_dot_)_net>]

The following reply was made to PR user/4176; it has been noted by GNATS.

From: Otto Moerbeek <otto_(_at_)_drijf_(_dot_)_net>
To: j0_(_at_)_cox_(_dot_)_net
Cc: gnats_(_at_)_openbsd_(_dot_)_org
Subject: Re: user/4176: calendar file parsing
Date: Fri, 15 Apr 2005 16:18:30 +0200 (CEST)

 On Fri, 15 Apr 2005 j0_(_at_)_cox_(_dot_)_net wrote:
 
 > >Number:         4176
 > >Category:       user
 > >Synopsis:       Calendar is changing the string "i386" to 1
 
 You can check with cpp -dM -undef < /dev/null that one symbol remains. 
 Here's a diff that also removes that one. Please try and see if the string 
 __GNUC__ is left untouched.
 
 	-Otto
 
 Index: io.c
 ===================================================================
 RCS file: /cvs/src/usr.bin/calendar/io.c,v
 retrieving revision 1.28
 diff -u -p -r1.28 io.c
 --- io.c	10 Dec 2004 15:31:01 -0000	1.28
 +++ io.c	15 Apr 2005 14:16:44 -0000
 @@ -377,8 +377,8 @@ opencal(void)
  			(void)dup2(fderr, STDERR_FILENO);
  			(void)close(fderr);
  		}
 -		execl(_PATH_CPP, "cpp", "-traditional", "-P", "-I.",
 -		    _PATH_INCLUDE, (char *)NULL);
 +		execl(_PATH_CPP, "cpp", "-traditional", "-undef", "-U__GNUC__",
 +		    "-P", "-I.", _PATH_INCLUDE, (char *)NULL);
  		warn(_PATH_CPP);
  		_exit(1);
  	}