+2005-06-09 Paul Eggert <eggert@cs.ucla.edu>
+
+ * data/yacc.c (malloc, free) [defined __cplusplus]: Wrap inside
+ extern "C" {}. This fixes a problem reported by Paul Hilfinger,
+ which stems from the 2005-05-27 patch.
+
2005-06-06 Paul Hilfinger <hilfingr@tully.CS.Berkeley.EDU>
* data/glr.c: Modify treatment of unused parameters to permit use
# ifndef YYSTACK_ALLOC_MAXIMUM
# define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
# endif
+# ifdef __cplusplus
+extern "C" {
+# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
+# ifdef __cplusplus
+}
+# endif
# endif
#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
# ifndef YYSTACK_ALLOC_MAXIMUM
# define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
# endif
+# ifdef __cplusplus
+extern "C" {
+# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
+# ifdef __cplusplus
+}
+# endif
# endif
#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
yylloc.start.line = yylloc.end.line = 1;
yylloc.start.column = yylloc.end.column = 0;
}
-/* Line 863 of yacc.c. */
-#line 1170 "parse-gram.c"
+/* Line 869 of yacc.c. */
+#line 1176 "parse-gram.c"
yyvsp[0] = yylval;
yylsp[0] = yylloc;
default: break;
}
-/* Line 1059 of yacc.c. */
-#line 1755 "parse-gram.c"
+/* Line 1065 of yacc.c. */
+#line 1761 "parse-gram.c"
\f
yyvsp -= yylen;
yyssp -= yylen;
assoc assoc;
uniqstr uniqstr;
} YYSTYPE;
-/* Line 1382 of yacc.c. */
+/* Line 1388 of yacc.c. */
#line 148 "parse-gram.h"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1