Remaining m4sugar merge from autoconf.

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index 9ae334a4b3fbe3646394493c1e5d4502cfe1f4ac..a633613c19476462cfa342bafae74b0adbf357d7 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,10 +1,10 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 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 the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef COMPLAIN_H_
 # define COMPLAIN_H_ 1
@@ -25,7 +23,7 @@
 extern "C" {
 # endif
 
-/* Informative messages, but we proceed.  */
+/** Informative messages, but we proceed.  */
 
 void warn (char const *format, ...)
   __attribute__ ((__format__ (__printf__, 1, 2)));
@@ -33,7 +31,7 @@ void warn (char const *format, ...)
 void warn_at (location loc, char const *format, ...)
   __attribute__ ((__format__ (__printf__, 2, 3)));
 
-/* Something bad happened, but let's continue and die later.  */
+/** An error, but we continue and die later.  */
 
 void complain (char const *format, ...)
   __attribute__ ((__format__ (__printf__, 1, 2)));
@@ -41,7 +39,7 @@ void complain (char const *format, ...)
 void complain_at (location loc, char const *format, ...)
   __attribute__ ((__format__ (__printf__, 2, 3)));
 
-/* Something bad happened, and let's die now.  */
+/** A fatal error, causing immediate exit.  */
 
 void fatal (char const *format, ...)
   __attribute__ ((__noreturn__, __format__ (__printf__, 1, 2)));
@@ -49,10 +47,7 @@ void fatal (char const *format, ...)
 void fatal_at (location loc, char const *format, ...)
   __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)));
 
-/* This variable is set each time `warn' is called.  */
-extern bool warning_issued;
-
-/* This variable is set each time `complain' is called.  */
+/** Whether an error was reported.  */
 extern bool complaint_issued;
 
 # ifdef        __cplusplus