about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/i386/i486/bits/string.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2094818e4f..3df33a74f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-18  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* sysdeps/i386/i486/bits/string.h (rawmemchr): Remove unneccessary
+	if _FORCE_INLINES.
+
 1999-05-17  Ulrich Drepper  <drepper@cygnus.com>
 
 	* elf/Makefile (distribute): Remove dl-origin.h.
diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h
index 5bf80f0398..39edc6ec56 100644
--- a/sysdeps/i386/i486/bits/string.h
+++ b/sysdeps/i386/i486/bits/string.h
@@ -430,8 +430,8 @@ memchr (__const void *__s, int __c, size_t __n)
 
 /* Return pointer to C in S.  */
 #define _HAVE_STRING_ARCH_rawmemchr 1
-__STRING_INLINE void *__rawmemchr (const void *__s, int __c); 
- 
+__STRING_INLINE void *__rawmemchr (const void *__s, int __c);
+
 #ifndef _FORCE_INLINES
 __STRING_INLINE void *
 __rawmemchr (const void *__s, int __c)
@@ -446,13 +446,13 @@ __rawmemchr (const void *__s, int __c)
      : "cc");
   return __res - 1;
 }
-#if defined __USE_GNU && !defined _FORCE_INLINES
+# ifdef __USE_GNU
 __STRING_INLINE void *
 rawmemchr (const void *__s, int __c)
 {
   return __rawmemchr (__s, __c);
 }
-# endif	/* use GNU */ 
+# endif	/* use GNU */
 #endif