X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fxstriconv.c;h=14d8775cbf04643120ec87ec42a2e7c70d186585;hb=90f8d0d3e4ce4b1f4118d35eba6a051558323ace;hp=5657eda8f287914f0b722679a409e97c79887b0d;hpb=041e6f00a4d6811b671eb5dda95ee6264c50a33d;p=gnulib.git

diff --git a/lib/xstriconv.c b/lib/xstriconv.c
index 5657eda8f..14d8775cb 100644
--- a/lib/xstriconv.c
+++ b/lib/xstriconv.c
@@ -2,10 +2,10 @@
    Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
-   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, 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
@@ -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>
 
 /* Specification.  */
 #include "xstriconv.h"