--- perl-5.12.5/perly.h.orig	Sat Nov  3 16:26:01 2012

+++ perl-5.12.5/perly.h	Thu Jan  7 00:01:54 2016

@@ -1,24 +1,25 @@

 #ifdef PERL_CORE

+/* A Bison parser, made by GNU Bison 2.3.  */

-/* A Bison parser, made by GNU Bison 2.4.1.  */

-

 /* Skeleton interface for Bison's Yacc-like parsers in C

-   

-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006

+

+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006

    Free Software Foundation, Inc.

-   

-   This program is free software: you can redistribute it and/or modify

+

+   This program is free software; you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation, either version 3 of the License, or

-   (at your option) any later version.

-   

+   the Free Software Foundation; either version 2, or (at your option)

+   any later version.

+

    This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of

    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

    GNU General Public License for more details.

-   

+

    You should have received a copy of the GNU General Public License

-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

+   along with this program; if not, write to the Free Software

+   Foundation, Inc., 51 Franklin Street, Fifth Floor,

+   Boston, MA 02110-1301, USA.  */

 /* As a special exception, you may create a larger work that contains

    part or all of the Bison parser skeleton and distribute that work

@@ -29,11 +30,10 @@

    special exception, which will cause the skeleton and the resulting

    Bison output files to be licensed under the GNU General Public

    License without this special exception.

-   

+

    This special exception was added by the Free Software Foundation in

    version 2.2 of Bison.  */

-

 /* Tokens.  */

 #ifndef YYTOKENTYPE

 # define YYTOKENTYPE

@@ -113,7 +113,6 @@

      PEG = 328

    };

 #endif

-

 /* Tokens.  */

 #define WORD 258

 #define METHOD 259

@@ -189,13 +188,11 @@

+

 #endif /* PERL_CORE */

 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED

 typedef union YYSTYPE

 {

-

-/* Line 1676 of yacc.c  */

-

     I32	ival; /* __DEFAULT__ (marker for regen_perly.pl;

 				must always be 1st union member) */

     char *pval;

@@ -211,16 +208,13 @@

 #ifdef PERL_MAD

     TOKEN* tkval;

 #endif

-

-

-

-/* Line 1676 of yacc.c  */

-} YYSTYPE;

-# define YYSTYPE_IS_TRIVIAL 1

+}

+/* Line 1489 of yacc.c.  */

+	YYSTYPE;

 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

 # define YYSTYPE_IS_DECLARED 1

+# define YYSTYPE_IS_TRIVIAL 1

 #endif

-