X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmemcoll.c;h=e777e6a5bc7fca5cebc4a5a1bd7b994dba4fe629;hb=e57dfac3355164cfbfcb5473a42130dab793fe9f;hp=49eccdad29ec5138a2177c02c72cef0193306af3;hpb=45d311ec0b6f52837cd256947672d46eaf4859fc;p=gnulib.git

diff --git a/lib/memcoll.c b/lib/memcoll.c
index 49eccdad2..e777e6a5b 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
@@ -21,16 +21,10 @@
 # include <config.h>
 #endif
 
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-#include <sys/types.h>
+#include "memcoll.h"
 
-#if HAVE_STRING_H
-# include <string.h>
-#endif
+#include <errno.h>
+#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