aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--manual/filesys.texi2
-rw-r--r--string/bits/string2.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index affa6414df..de8a9e0fc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-06-25 Ulrich Drepper <drepper@cygnus.com>
+
+ * string/bits/string2.h (strnlen): Remove extra prototype.
+
1999-06-25 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/filesys.texi (Working on Directory Trees): Fix typos.
diff --git a/manual/filesys.texi b/manual/filesys.texi
index c40ac1efac..51af84633d 100644
--- a/manual/filesys.texi
+++ b/manual/filesys.texi
@@ -703,7 +703,7 @@ set since then the current directory is the one the current item is
found in.
@item int level
While processing the directory the function tracks how many directories
-have been examineed to find the current item. This nesting level is
+have been examined to find the current item. This nesting level is
@math{0} for the item given starting item (file or directory) and is
incremented by one for each entered directory.
@end table
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 48903b3e81..43cb6d5eff 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -943,7 +943,6 @@ __strpbrk_c3 (__const char *__s, char __accept1, char __accept2,
#if defined __USE_GNU && !defined _FORCE_INLINES
# ifndef _HAVE_STRING_ARCH_strnlen
-__STRING_INLINE size_t strnlen (__const char *__string, size_t __maxlen);
__STRING_INLINE size_t
strnlen (__const char *__string, size_t __maxlen)
{