From owner-svn-src-head@FreeBSD.ORG Fri Oct 10 14:50:49 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0DB90C8; Fri, 10 Oct 2014 14:50:49 +0000 (UTC) Received: from mail-wg0-x22f.google.com (mail-wg0-x22f.google.com [IPv6:2a00:1450:400c:c00::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 12C142D2; Fri, 10 Oct 2014 14:50:47 +0000 (UTC) Received: by mail-wg0-f47.google.com with SMTP id x13so4077069wgg.6 for ; Fri, 10 Oct 2014 07:50:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=V+FaLF7GPQzi9VTkVhD1XPsOIz/PkCxSCuhxFM1aYpI=; b=LYyeQuIZ+Eo13xVmCmSFBuTBj2PtVFdhhP8Qw8z2ZjekhZYJsq4SIUVVa3C3P/816M Ul6LzYg9xAtqw3AJJtjwL0s6NbWrfxABNkcPTkjYPjxMufVz4wLvulWUviJFLjRxi6uO LRbMBnlGp4bwpw3zMqLBmFewRYvlp3Wn0hq0cnxZEN6fVotVEnC5RhP3DJDAoBuJAPMr fZZZ0+ARLTYSMdNY3Uld/zSSbbQV8xPRyLipX+jXeu2YWAv9/RaHEoANT5Ys9DuJpuR8 urIoE4PJZ2VdVmdvAnf/QHD7Ui/LhKtjGSvasQUj7WbqzdIeySXJBwPqAI69TJYOf9vc mKWg== X-Received: by 10.180.104.199 with SMTP id gg7mr5275500wib.46.1412952646237; Fri, 10 Oct 2014 07:50:46 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id bv17sm2874841wib.13.2014.10.10.07.50.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Oct 2014 07:50:45 -0700 (PDT) Sender: Baptiste Daroussin Date: Fri, 10 Oct 2014 16:50:43 +0200 From: Baptiste Daroussin To: Ian Lepore Subject: Re: svn commit: r272808 - head/include/rpcsvc Message-ID: <20141010145043.GI19486@ivaldir.etoilebsd.net> References: <201410090658.s996wYOr096351@svn.freebsd.org> <1412949811.12052.270.camel@revolution.hippie.lan> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dMdWWqg3F2Dv/qfw" Content-Disposition: inline In-Reply-To: <1412949811.12052.270.camel@revolution.hippie.lan> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Oct 2014 14:50:49 -0000 --dMdWWqg3F2Dv/qfw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 > >=20 > > Log: > > Fix build with rpcgen using a recent (tested with gcc 4.9.1) GNU cpp > >=20 > > Modified: > > head/include/rpcsvc/nis.x > >=20 > > Modified: head/include/rpcsvc/nis.x > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- 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_AC= C + 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].e= c_value.ec_value_val > > +%#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].e= c_value.ec_value_len > > % > > %#ifdef __cplusplus > > %} > >=20 >=20 > How does unwrapping these lines so that they're longer than the style(9) > limits fix the build? >=20 > (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.) >=20 to be honnest here I don't know how rpcgen passes lines to cpp but recent G= NU cpp are failing because of that, looking at dragonfly I have seen they fixed the same way. regards, Bapt --dMdWWqg3F2Dv/qfw Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlQ38kMACgkQ8kTtMUmk6ExXEACgkKzLE/G3quUVncTDKezXdbO+ nI4An1mh7DC8AsNMNHCh6wo10VyNdfk8 =LMei -----END PGP SIGNATURE----- --dMdWWqg3F2Dv/qfw--