X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmemcoll.c;h=e5ef36397b6a5af2b9361ff71fb42064c2e25947;hb=a9e638f0e4d6928c12f2b374bc369bb1ecf2cdfe;hp=7f61a6b58cb25e8577f6df7744fa38d37889b35e;hpb=7560f27e580a611b89348447a1540514ffac32f8;p=gnulib.git

diff --git a/lib/memcoll.c b/lib/memcoll.c
index 7f61a6b58..e5ef36397 100644
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -1,5 +1,6 @@
 /* Locale-specific memory comparison.
-   Copyright (C) 1999, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+   Copyright (C) 1999, 2002, 2003, 2004, 2006 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
@@ -17,9 +18,7 @@
 
 /* Contributed by Paul Eggert <eggert@twinsun.com>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "memcoll.h"
 
@@ -43,7 +42,10 @@ memcoll (char *s1, size_t s1len, char *s2, size_t s2len)
      the buffers using strcoll on each substring.  */
 
   if (s1len == s2len && memcmp (s1, s2, s1len) == 0)
-    diff = 0;
+    {
+      errno = 0;
+      diff = 0;
+    }
   else
     {
       char n1 = s1[s1len];