X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmemcoll.c;h=82d889f409d3fee8f94e95058a4d26797e9930e3;hb=d9e80c64c98313550d5103d8cfb22601a800e62d;hp=2bb33fdfc5cf67e722eca2a80977d8052b2fafb6;hpb=92295bc4b2a378893386efd3cf8cf9bc31024b59;p=gnulib.git

diff --git a/lib/memcoll.c b/lib/memcoll.c
index 2bb33fdfc..82d889f40 100644
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -1,5 +1,5 @@
 /* Locale-specific memory comparison.
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2003, 2004 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
@@ -13,24 +13,18 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Paul Eggert <eggert@twinsun.com>.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
 #include "memcoll.h"
 
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
 
 /* Compare S1 (with length S1LEN) and S2 (with length S2LEN) according
    to the LC_COLLATE locale.  S1 and S2 do not overlap, and are not
@@ -83,6 +77,7 @@ memcoll (char *s1, size_t s1len, char *s2, size_t s2len)
   diff = memcmp (s1, s2, s1len < s2len ? s1len : s2len);
   if (! diff)
     diff = s1len < s2len ? -1 : s1len != s2len;
+  errno = 0;
 
 #endif