Merge commit 'upstream/2.20'

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

diff --git a/binutils/arparse.c b/binutils/arparse.c
index 5adb8a51946abfde3f08350bbd858c7fb1865960..6251c32abe511b832efa2cfcd9e4fdaa3017d6e6 100644 (file)
--- a/binutils/arparse.c
+++ b/binutils/arparse.c
@@ -114,7 +114,7 @@
 
 /* arparse.y - Stange script language parser */
 
-/* Copyright 1992, 1993, 1995, 1997, 1999, 2002, 2003, 2007
+/* Copyright 1992, 1993, 1995, 1997, 1999, 2002, 2003, 2005, 2007
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -174,7 +174,7 @@ typedef union YYSTYPE
 struct list *list ;
 
 }
-/* Line 187 of yacc.c.  */
+/* Line 193 of yacc.c.  */
 #line 179 "arparse.c"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -238,7 +238,7 @@ typedef short int yytype_int16;
 #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)
@@ -686,7 +686,7 @@ while (YYID (0))
    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,     \