diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-03-18 18:01:40 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-03-18 18:01:40 +0000 |
commit | 57fa34b52e7c26f780c6bcae7a8ea863dfe710e1 (patch) | |
tree | 1fe2959ca795d67fb10559d0f300b06c2fd0b68c /libc/sysdeps/s390/bits/string.h | |
parent | e97d73d87846a62aff09c388bd938c0b1d410931 (diff) |
Merge changes between r1382 and r1748 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@1749 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/s390/bits/string.h')
-rw-r--r-- | libc/sysdeps/s390/bits/string.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/sysdeps/s390/bits/string.h b/libc/sysdeps/s390/bits/string.h index d83df39bb..e16c7cb82 100644 --- a/libc/sysdeps/s390/bits/string.h +++ b/libc/sysdeps/s390/bits/string.h @@ -1,5 +1,5 @@ /* Optimized, inlined string functions. S/390 version. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2007 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -34,7 +34,7 @@ # ifdef __cplusplus # define __STRING_INLINE inline # else -# define __STRING_INLINE extern __inline +# define __STRING_INLINE __extern_inline # endif #endif |