about summary refs log tree commit diff
path: root/string/bits/string2.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-21 17:12:43 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-21 17:12:43 +0000
commit6c6bb0558c6adebd450cc7037305f89e746597b5 (patch)
tree062811cf59fbbb94bab8d7cc02894772cbe2d412 /string/bits/string2.h
parent425966d0707380015fcbcbc9b206500761ab8505 (diff)
downloadglibc-6c6bb0558c6adebd450cc7037305f89e746597b5.tar.gz
glibc-6c6bb0558c6adebd450cc7037305f89e746597b5.tar.xz
glibc-6c6bb0558c6adebd450cc7037305f89e746597b5.zip
Update.
	* string/bits/string2.h: Remove strnlen optimization here.
	* sysdeps/i386/i486/bits/string.h: Add it here.

2001-08-21  Wolfram Gloger  <wg@malloc.de>

	* malloc/malloc.c: Make access to ..._hook pointers thread-safe.

2001-08-21  Ulrich Drepper  <drepper@redhat.com>
Diffstat (limited to 'string/bits/string2.h')
-rw-r--r--string/bits/string2.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 213ab2e516..1caa81b403 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -1021,18 +1021,6 @@ __strpbrk_c3 (__const char *__s, int __accept1, int __accept2,
 #endif
 
 
-#if defined __USE_GNU && !defined _FORCE_INLINES
-# ifndef _HAVE_STRING_ARCH_strnlen
-__STRING_INLINE size_t
-strnlen (__const char *__string, size_t __maxlen)
-{
-  __const char *__end = (__const char *) memchr (__string, '\0', __maxlen);
-  return __end ? (size_t) (__end - __string) : __maxlen;
-}
-# endif
-#endif
-
-
 #ifndef _HAVE_STRING_ARCH_strtok_r
 # define __strtok_r(s, sep, nextp) \
   (__extension__ (__builtin_constant_p (sep) && __string2_1bptr_p (sep)	      \