Update to the current gnulib CVS repository, and fix trigraph handling

[bison.git] / lib / timevar.c

diff --git a/lib/timevar.c b/lib/timevar.c
index d9b533ce8c0633a9b133205b09e3712e1df6142e..c79252b2817c1ca4639a05aae42fcbea25331ce0 100644 (file)
--- a/lib/timevar.c
+++ b/lib/timevar.c
@@ -2,9 +2,9 @@
    Copyright (C) 2000, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
    Contributed by Alex Samuel <samuel@codesourcery.com>
 
-   This program is free software; you can redistribute it and/or modify
+   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 of the License, or
+   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,
@@ -13,12 +13,9 @@
    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/>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #if IN_GCC