From: Andreas Jaeger <aj@suse.de>
Date: Mon, 12 Mar 2001 08:21:29 +0000 (+0000)
Subject: Protect __STRING_INLINE against redefinition.
X-Git-Tag: cvs/glibc-2_2_3~271
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=d4497c9fb1b1e86b655562e88c6c069ddbcb5bca;p=glibc.git

Protect __STRING_INLINE against redefinition.
---

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