This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Protect __STRING_INLINE in s390


I got this warning on S390 and fixed it with the appended patch:
In file included from ../string/string.h:356,
                 from ../include/string.h:49,
                 from string-inlines.c:28:
../sysdeps/s390/bits/string.h:37: warning: `__STRING_INLINE' redefined

I'm committing the patch now,
Andreas

2001-03-12  Andreas Jaeger  <aj@suse.de>

	* sysdeps/s390/bits/string.h: Protect __STRING_INLINE against
	redefinition. 

============================================================
Index: sysdeps/s390/bits/string.h
--- sysdeps/s390/bits/string.h	2000/11/23 06:30:40	1.4
+++ sysdeps/s390/bits/string.h	2001/03/12 08:19:42
@@ -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

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.inka.de
    http://www.suse.de/~aj
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]