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...

[Cy Schubert]

In message <CAGHfRMCG0iPsbaBkdWvWb326c6hMyrT5LXk8QRhBaXGNBLW4Qg at mail.gmail.c
om>
, NGie Cooper writes:
> On Mon, Mar 30, 2015 at 6:30 AM, Cy Schubert <cy at freebsd.org> 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 <Cy.Schubert at komquats.com> or <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.