svn commit: r272808 - head/include/rpcsvc

Baptiste Daroussin bapt at FreeBSD.org
Fri Oct 10 14:50:49 UTC 2014


On Fri, Oct 10, 2014 at 08:03:31AM -0600, Ian Lepore wrote:
> On Thu, 2014-10-09 at 06:58 +0000, Baptiste Daroussin wrote:
> > Author: bapt
> > Date: Thu Oct  9 06:58:33 2014
> > New Revision: 272808
> > URL: https://svnweb.freebsd.org/changeset/base/272808
> > 
> > Log:
> >   Fix build with rpcgen using a recent (tested with gcc 4.9.1) GNU cpp
> > 
> > Modified:
> >   head/include/rpcsvc/nis.x
> > 
> > Modified: head/include/rpcsvc/nis.x
> > ==============================================================================
> > --- head/include/rpcsvc/nis.x	Thu Oct  9 06:24:06 2014	(r272807)
> > +++ head/include/rpcsvc/nis.x	Thu Oct  9 06:58:33 2014	(r272808)
> > @@ -400,10 +400,7 @@ program  NIS_PROG {
> >  %#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
> >  %#define WORLD_DEFAULT (NIS_READ_ACC)
> >  %#define GROUP_DEFAULT (NIS_READ_ACC << 8)
> > -%#define OWNER_DEFAULT ((NIS_READ_ACC +\
> > -			 NIS_MODIFY_ACC +\
> > -			 NIS_CREATE_ACC +\
> > -			 NIS_DESTROY_ACC) << 16)
> > +%#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16)
> >  %#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
> >  %
> >  %/* Result manipulation defines ... */
> > @@ -432,10 +429,8 @@ program  NIS_PROG {
> >  % * these definitions they take an nis_object *, and an int and return
> >  % * a u_char * for Value, and an int for length.
> >  % */
> > -%#define ENTRY_VAL(obj, col) \
> > -	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
> > -%#define ENTRY_LEN(obj, col) \
> > -	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
> > +%#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
> > +%#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
> >  %
> >  %#ifdef __cplusplus
> >  %}
> > 
> 
> How does unwrapping these lines so that they're longer than the style(9)
> limits fix the build?
> 
> (I'm not a fan of 80-column limits, it's a rule that needs to die die
> die.  I'm just curious what the actual fix is here.)
> 

to be honnest here I don't know how rpcgen passes lines to cpp but recent GNU cpp
are failing because of that, looking at dragonfly I have seen they fixed the
same way.

regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20141010/7ae2b234/attachment.sig>


More information about the svn-src-all mailing list