diff options
| author | Andreas Jaeger <aj@suse.de> | 2001-03-12 08:21:29 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2001-03-12 08:21:29 +0000 |
| commit | d4497c9fb1b1e86b655562e88c6c069ddbcb5bca (patch) | |
| tree | fa3aedeecfcdae8338d0d9e8c7eb61b02eca4db6 /sysdeps/s390 | |
| parent | 50944bca4bfeefc5de2ec205ad549eb669ed1008 (diff) | |
| download | glibc-d4497c9fb1b1e86b655562e88c6c069ddbcb5bca.tar.gz glibc-d4497c9fb1b1e86b655562e88c6c069ddbcb5bca.tar.xz glibc-d4497c9fb1b1e86b655562e88c6c069ddbcb5bca.zip | |
Protect __STRING_INLINE against redefinition.
Diffstat (limited to 'sysdeps/s390')
| -rw-r--r-- | sysdeps/s390/bits/string.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sysdeps/s390/bits/string.h b/sysdeps/s390/bits/string.h index 6e5db9cde3..791f939225 100644 --- a/sysdeps/s390/bits/string.h +++ b/sysdeps/s390/bits/string.h @@ -1,5 +1,5 @@ /* Optimized, inlined string functions. s390 version. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2001 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -31,10 +31,12 @@ #if !defined __NO_STRING_INLINES && defined __USE_STRING_INLINES \ && defined __GNUC__ && __GNUC__ >= 2 -#ifdef __cplusplus -# define __STRING_INLINE inline -#else -# define __STRING_INLINE extern __inline +#ifndef __STRING_INLINE +# ifdef __cplusplus +# define __STRING_INLINE inline +# else +# define __STRING_INLINE extern __inline +# endif #endif #define _HAVE_STRING_ARCH_strlen 1 |