Undo 2005-12-01 tentative license wording change.

[bison.git] / data / glr.cc

diff --git a/data/glr.cc b/data/glr.cc
index a9c855221cb210c21993263903337df73bd563c2..69232f97d4944364db389cd3621238df8bd6d9d5 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -112,7 +112,7 @@ m4_popdef([b4_parse_param])dnl
     /* Pacify ``unused variable'' warnings.  */
     YYUSE (yyvaluep);
     YYUSE (yylocationp);
-    /* Backward compatibility, but should be removed eventually. */
+    /* Backward compatibility, but should be removed eventually.  */
     std::ostream& cdebug_ = *yycdebug_;
     YYUSE (cdebug_);
 
@@ -168,12 +168,6 @@ m4_include(b4_pkgdatadir/[glr.c])
 b4_copyright([C++ Skeleton parser for GLALR(1) parsing with Bison],
              [2002, 2003, 2004, 2005])[
 
-/* As a special exception, when this parser skeleton is copied by
-   Bison into a Bison output file, you may use that output file
-   without restriction.  This special exception was added by the Free
-   Software Foundation for C++ GLR parsers in version 2.2 of
-   Bison.  */
-
 /* C++ GLR parser skeleton written by Akim Demaille.  */
 
 #ifndef PARSER_HEADER_H
@@ -243,7 +237,7 @@ b4_syncline([@oline@], [@ofile@])[
        {                                                               \
          (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
        }                                                               \
-    while (/*CONSTCOND*/ 0)
+    while (0)
 #endif
 
 namespace yy