X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmemcoll.c;h=34ae767dbdbb800cc491f5dedace0ed602375fda;hb=a1d462a378bebcdb57d628c501fa2c008c7f05a9;hp=2bb33fdfc5cf67e722eca2a80977d8052b2fafb6;hpb=92295bc4b2a378893386efd3cf8cf9bc31024b59;p=gnulib.git diff --git a/lib/memcoll.c b/lib/memcoll.c index 2bb33fdfc..34ae767db 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 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 @@ -28,9 +28,7 @@ extern int errno; #endif -#if HAVE_STRING_H -# include -#endif +#include /* 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 +81,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