diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-01-06 22:07:28 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-01-06 22:07:28 +0000 |
commit | df4ef2ab9c0899b2670067cd97e58f7eb2913e00 (patch) | |
tree | 4cb343b5ba9ccdc9c0b96144412567b6a4eda0ee /string | |
parent | 6f9e7002f38ae778b3ff2f586a3e5766382228e9 (diff) | |
download | glibc-df4ef2ab9c0899b2670067cd97e58f7eb2913e00.tar.gz glibc-df4ef2ab9c0899b2670067cd97e58f7eb2913e00.tar.xz glibc-df4ef2ab9c0899b2670067cd97e58f7eb2913e00.zip |
update from main archive 960105 cvs/libc-970107 cvs/libc-970106
Diffstat (limited to 'string')
-rw-r--r-- | string/string.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/string/string.h b/string/string.h index c51fb956ea..4560f612b5 100644 --- a/string/string.h +++ b/string/string.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 95, 96 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 95, 96, 97 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -164,7 +164,7 @@ extern size_t strnlen __P ((__const char *__string, size_t __maxlen)); extern __inline size_t strnlen (__const char *__string, size_t __maxlen) { - __const char *__end = memchr (__string, '\0', __maxlen); + __const char *__end = (__const char *) memchr (__string, '\0', __maxlen); return __end ? __end - __string : __maxlen; } #endif |