Merge commit 'upstream/2.20'

[msp430-binutils.git] / binutils / nlmheader.c

diff --git a/binutils/nlmheader.c b/binutils/nlmheader.c
index 6bbc63cfec2b9179ebf3bfa623f830b69174810d..34956d719b78fd528b8252f94c3378719240e0a5 100644 (file)
--- a/binutils/nlmheader.c
+++ b/binutils/nlmheader.c
@@ -146,7 +146,7 @@
 /* Copy the first part of user declarations.  */
 #line 1 "nlmheader.y"
 /* nlmheader.y - parse NLM header specification keywords.
 /* Copy the first part of user declarations.  */
 #line 1 "nlmheader.y"
 /* nlmheader.y - parse NLM header specification keywords.

-     Copyright 1993, 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2007
+     Copyright 1993, 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2005, 2007

      Free Software Foundation, Inc.
 
      This file is part of GNU Binutils.
      Free Software Foundation, Inc.
 
      This file is part of GNU Binutils.


@@ -281,7 +281,7 @@ typedef union YYSTYPE
   char *string;
   struct string_list *list;
 }
   char *string;
   struct string_list *list;
 }

-/* Line 187 of yacc.c.  */
+/* Line 193 of yacc.c.  */

 #line 286 "nlmheader.c"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 #line 286 "nlmheader.c"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */


@@ -345,7 +345,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_

-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS

 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)


@@ -819,7 +819,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT

-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL

 #  define YY_LOCATION_PRINT(File, Loc)                 \
      fprintf (File, "%d.%d-%d.%d",                     \
              (Loc).first_line, (Loc).first_column,     \
 #  define YY_LOCATION_PRINT(File, Loc)                 \
      fprintf (File, "%d.%d-%d.%d",                     \
              (Loc).first_line, (Loc).first_column,     \