diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-11-30 14:53:29 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-11-30 14:54:41 +0100 |
| commit | 488fb43a499982e99915c78bb70f04357ac37463 (patch) | |
| tree | e356d0f1d327ed3de4a9d5abec1edf346070aa32 /string/bits/string3.h | |
| parent | eab709096f23a4511adfc547450a83008eae5fb2 (diff) | |
| parent | 20af204581e1ba42738c1bfb69cc2f5350f4ffa4 (diff) | |
Merge branch 'release/2.11/master' into fedora/2.11/master
Diffstat (limited to 'string/bits/string3.h')
| -rw-r--r-- | string/bits/string3.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/string/bits/string3.h b/string/bits/string3.h index a5593e3b89..1d759f181b 100644 --- a/string/bits/string3.h +++ b/string/bits/string3.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2004, 2005, 2007, 2009 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 @@ -77,7 +77,8 @@ __NTH (mempcpy (void *__restrict __dest, __const void *__restrict __src, __extern_always_inline void * __NTH (memset (void *__dest, int __ch, size_t __len)) { - if (__builtin_constant_p (__len) && __len == 0) + if (__builtin_constant_p (__len) && __len == 0 + && (!__builtin_constant_p (__ch) || __ch != 0)) { __warn_memset_zero_len (); return __dest; |