X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fxmemcoll.c;h=84bbd8ced3131fa732008fa580da5b8cb8b08949;hb=027bd46103b5e6a19653b216b15fe04d3a3f63bc;hp=433d67f9c49eb8f6185df652e3fd76e208edd7e5;hpb=a62be9f4039b4499cfbb76e394cad2259d03fa84;p=gnulib.git

diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c
index 433d67f9c..84bbd8ced 100644
--- a/lib/xmemcoll.c
+++ b/lib/xmemcoll.c
@@ -1,10 +1,11 @@
 /* Locale-specific memory comparison.
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 2002-2004, 2006, 2009-2010 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,11 @@
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Contributed by Paul Eggert <eggert@twinsun.com>.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <stdlib.h>
@@ -50,9 +48,9 @@ xmemcoll (char *s1, size_t s1len, char *s2, size_t s2len)
       error (0, collation_errno, _("string comparison failed"));
       error (0, 0, _("Set LC_ALL='C' to work around the problem."));
       error (exit_failure, 0,
-	     _("The strings compared were %s and %s."),
-	     quotearg_n_style_mem (0, locale_quoting_style, s1, s1len),
-	     quotearg_n_style_mem (1, locale_quoting_style, s2, s2len));
+             _("The strings compared were %s and %s."),
+             quotearg_n_style_mem (0, locale_quoting_style, s1, s1len),
+             quotearg_n_style_mem (1, locale_quoting_style, s2, s2len));
     }
 
   return diff;