Imported binutils-2.20

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

diff --git a/binutils/defparse.c b/binutils/defparse.c
index 0eb72e0b6bffb5942300d50a426c282c80e4aae5..52ef11588ecd5b1d2ed730defcea9e0defb38b63 100644 (file)
--- a/binutils/defparse.c
+++ b/binutils/defparse.c
@@ -133,7 +133,7 @@
 #line 1 "defparse.y"
  /* defparse.y - parser for .def files */
 
 #line 1 "defparse.y"
  /* defparse.y - parser for .def files */
 

-/* Copyright 1995, 1997, 1998, 1999, 2001, 2004, 2007
+/* Copyright 1995, 1997, 1998, 1999, 2001, 2004, 2005, 2007

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


@@ -184,7 +184,7 @@ typedef union YYSTYPE
   char *id;
   int number;
 }
   char *id;
   int number;
 }

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

 #line 189 "defparse.c"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 #line 189 "defparse.c"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */


@@ -248,7 +248,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)


@@ -746,7 +746,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,     \