X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmemcoll.c;h=e777e6a5bc7fca5cebc4a5a1bd7b994dba4fe629;hb=3bd23802ad65a4379e0c97d736dc6c2ab2d37f1d;hp=38d2bdfbda520b7ac3f412ae19c69b721c5144f1;hpb=1c6134292b7e3bc34c14c67bea2ff34c24499de0;p=gnulib.git

diff --git a/lib/memcoll.c b/lib/memcoll.c
index 38d2bdfbd..e777e6a5b 100644
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -1,5 +1,5 @@
 /* Locale-specific memory comparison.
-   Copyright (C) 1999, 2002, 2003 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
@@ -24,13 +24,7 @@
 #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