* src/output.c (output_skeleton): Don't hard wire the inclusion of

c.m4.
* data/c++.m4: Include c.m4.
* data/glr.cc: Do not include stack.hh.
This commit is contained in:
Akim Demaille
2006-01-02 16:06:11 +00:00
parent 9ecafbbfe7
commit 3953ed882a
4 changed files with 17 additions and 14 deletions

View File

@@ -2,7 +2,7 @@ m4_divert(-1) -*- Autoconf -*-
# C++ skeleton for Bison
# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,6 +19,8 @@ m4_divert(-1) -*- Autoconf -*-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA
m4_include(b4_pkgdatadir/[c.m4])
## ---------------- ##
## Default values. ##
## ---------------- ##

View File

@@ -1,7 +1,7 @@
m4_divert(-1) -*- C -*-
# C++ GLR skeleton for Bison
# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -190,7 +190,6 @@ namespace yy
]/* Line __line__ of glr.cc. */
b4_syncline([@oline@], [@ofile@])[
#include "stack.hh"
#include "location.hh"
/* Enabling traces. */