Imported binutils-2.20

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

diff --git a/binutils/sysinfo.c b/binutils/sysinfo.c
index f1c7a4bf12b5a2256d9159b1a83c818408f77946..53b151fb6262388a165a4b55834c54f0b91d84e6 100644 (file)
--- a/binutils/sysinfo.c
+++ b/binutils/sysinfo.c
@@ -130,7 +130,7 @@ typedef union YYSTYPE
  int i;
  char *s;
 }
-/* Line 187 of yacc.c.  */
+/* Line 193 of yacc.c.  */
 #line 135 "sysinfo.c"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -194,7 +194,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)
@@ -625,7 +625,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,     \