X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadtokens0.c;h=ccd2860c0729a222c62d61d74afdd4c21f078482;hb=78f5fbf491b6f12a67a633f919ec24f97570a733;hp=55b39a747f58c74ce5db113575901e9f571e74b1;hpb=222b0486b7db1b09293e05512873d633440efcb3;p=gnulib.git

diff --git a/lib/readtokens0.c b/lib/readtokens0.c
index 55b39a747..ccd2860c0 100644
--- a/lib/readtokens0.c
+++ b/lib/readtokens0.c
@@ -1,10 +1,11 @@
 /* readtokens0.c -- Read NUL-separated tokens from an input stream.
-   Copyright (C) 2004 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 2004, 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.
+   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,14 +13,12 @@
    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/>.
 
    Written by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
 #include <stdlib.h>
 
 #include "readtokens0.h"