projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* build-aux/maint.mk: Add indent target.
[gnulib.git]
/
lib
/
memcoll.c
diff --git
a/lib/memcoll.c
b/lib/memcoll.c
index
2bb33fd
..
82d889f
100644
(file)
--- a/
lib/memcoll.c
+++ b/
lib/memcoll.c
@@
-1,5
+1,5
@@
/* Locale-specific memory comparison.
/* 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
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,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Contributed by Paul Eggert <eggert@twinsun.com>. */
/* Contributed by Paul Eggert <eggert@twinsun.com>. */
-#if HAVE_CONFIG_H
+#if
def
HAVE_CONFIG_H
# include <config.h>
#endif
#include "memcoll.h"
#include <errno.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
/* 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;
diff = memcmp (s1, s2, s1len < s2len ? s1len : s2len);
if (! diff)
diff = s1len < s2len ? -1 : s1len != s2len;
+ errno = 0;
#endif
#endif