From owner-svn-src-all@FreeBSD.ORG Fri Oct 10 14:03:40 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7AE23ECB; Fri, 10 Oct 2014 14:03:40 +0000 (UTC) Received: from mho-01-ewr.mailhop.org (mho-03-ewr.mailhop.org [204.13.248.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DB9CD9E; Fri, 10 Oct 2014 14:03:39 +0000 (UTC) Received: from [73.34.117.227] (helo=ilsoft.org) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1Xcan6-000H4K-JJ; Fri, 10 Oct 2014 14:03:32 +0000 Received: from [172.22.42.240] (revolution.hippie.lan [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id s9AE3VoX037578; Fri, 10 Oct 2014 08:03:31 -0600 (MDT) (envelope-from ian@FreeBSD.org) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 73.34.117.227 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18CHjGNQuq2WzP0G8cA7V4q X-Authentication-Warning: paranoia.hippie.lan: Host revolution.hippie.lan [172.22.42.240] claimed to be [172.22.42.240] Subject: Re: svn commit: r272808 - head/include/rpcsvc From: Ian Lepore To: Baptiste Daroussin In-Reply-To: <201410090658.s996wYOr096351@svn.freebsd.org> References: <201410090658.s996wYOr096351@svn.freebsd.org> Content-Type: text/plain; charset="us-ascii" Date: Fri, 10 Oct 2014 08:03:31 -0600 Message-ID: <1412949811.12052.270.camel@revolution.hippie.lan> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Oct 2014 14:03:40 -0000 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.) -- Ian