From d4497c9fb1b1e86b655562e88c6c069ddbcb5bca Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 12 Mar 2001 08:21:29 +0000 Subject: [PATCH] Protect __STRING_INLINE against redefinition. --- sysdeps/s390/bits/string.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sysdeps/s390/bits/string.h b/sysdeps/s390/bits/string.h index 6e5db9c..791f939 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 -- 2.7.4