From owner-svn-src-all@FreeBSD.ORG Tue Mar 31 19:42:33 2015 Return-Path: Delivered-To: svn-src-all@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 6B71D227; Tue, 31 Mar 2015 19:42:33 +0000 (UTC) Received: from smtp-out-02.shaw.ca (smtp-out-02.shaw.ca [64.59.136.138]) by mx1.freebsd.org (Postfix) with ESMTP id 14DE2BBD; Tue, 31 Mar 2015 19:42:32 +0000 (UTC) X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=UbGOdjJMTOnDdlSKs4VLEv47Nwxh2hlhayjdFxkzNJk= c=1 sm=1 a=BLceEmwcHowA:10 a=ICAaq7hcmGcA:10 a=kj9zAlcOel0A:10 a=hEcWSgSdC89mznESgQJhGw==:17 a=6I5d2MoRAAAA:8 a=BWvPGDcYAAAA:8 a=YxBL1-UpAAAA:8 a=ndOxABPCjEcXHiHL_UEA:9 a=CjuIK1q_8ugA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Received: from unknown (HELO slippy.cwsent.com) ([24.68.134.59]) by smtp-out-02.shaw.ca with ESMTP; 31 Mar 2015 13:42:30 -0600 Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.14.9/8.14.9) with ESMTP id t2VJgUHT049267; Tue, 31 Mar 2015 12:42:30 -0700 (PDT) (envelope-from Cy.Schubert@komquats.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.14.9/8.14.8/Submit) with ESMTP id t2VJgUXf049264; Tue, 31 Mar 2015 12:42:30 -0700 (PDT) (envelope-from Cy.Schubert@komquats.com) Message-Id: <201503311942.t2VJgUXf049264@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.komquats.com/ To: NGie Cooper Subject: Re: svn commit: r280849 - in head: contrib/ntp contrib/ntp/adjtimed contrib/ntp/arlib contrib/ntp/clockstuff contrib/ntp/conf contrib/ntp/html contrib/ntp/html/build contrib/ntp/html/drivers contrib/nt... In-Reply-To: Message from NGie Cooper of "Tue, 31 Mar 2015 11:57:38 -0700." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 31 Mar 2015 12:42:30 -0700 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Cy Schubert 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: Tue, 31 Mar 2015 19:42:33 -0000 In message , NGie Cooper writes: > On Mon, Mar 30, 2015 at 6:30 AM, Cy Schubert wrote: > > Author: cy > > Date: Mon Mar 30 13:30:15 2015 > > New Revision: 280849 > > URL: https://svnweb.freebsd.org/changeset/base/280849 > > > > Log: > > MFV ntp 4.2.8p1 (r258945, r275970, r276091, r276092, r276093, r278284) > > > > Thanks to roberto for providing pointers to wedge this into HEAD. > > > > Approved by: roberto > > This change broke the build. Please fix :(. > IIRC this is the fix. Index: ntp_parser.y =================================================================== --- ntp_parser.y (revision 280914) +++ ntp_parser.y (revision 280915) @@ -8,8 +8,8 @@ * Copyright (c) 2006 */ -%parse-param {struct FILE_INFO *ip_file} -%lex-param {struct FILE_INFO *ip_file} +%parse-param { struct FILE_INFO *ip_file } +%lex-param { struct FILE_INFO *ip_file } %{ #ifdef HAVE_CONFIG_H -- Cheers, Cy Schubert or FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.