From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 15 Jan 2010 00:16:21 +0000 (-0800)
Subject: Relax onditions in strings.h.
X-Git-Tag: upstream/2.30~13087
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd5c5f7051b72c57cf77c03f55f774776a2fd920;p=external%2Fglibc.git

Relax onditions in strings.h.
---

diff --git a/ChangeLog b/ChangeLog
index 9b078a0..6a9f5b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-14  Ulrich Drepper  <drepper@redhat.com>
 
+	* string/strings.h: Relax condition for bcmp, bcopy, bzero, ffs,
+	index, and rindex.
+
 	* stdlib/stdlib.h: Relax conditions for *cvt functions and valloc.
 
 	* Versions.def: Add GLIBC_2.12 for libpthread.
diff --git a/string/strings.h b/string/strings.h
index a3dde71..2ab83ca 100644
--- a/string/strings.h
+++ b/string/strings.h
@@ -36,7 +36,7 @@
 
 __BEGIN_DECLS
 
-# if !defined __USE_XOPEN2K8 || defined __USE_GNU
+# if defined __USE_MISC || !defined __USE_XOPEN2K8
 /* Compare N bytes of S1 and S2 (same as memcmp).  */
 extern int bcmp (__const void *__s1, __const void *__s2, size_t __n)
      __THROW __attribute_pure__;
@@ -104,7 +104,7 @@ extern char *rindex (__const char *__s, int __c)
 #  endif
 # endif
 
-#if !defined __USE_XOPEN2K8 || defined __USE_XOPEN2K8XSI
+#if defined __USE_MISC || !defined __USE_XOPEN2K8 || defined __USE_XOPEN2K8XSI
 /* Return the position of the first bit set in I, or 0 if none are set.
    The least-significant bit is position 1, the most-significant 32.  */
 extern int ffs (int __i) __THROW __attribute__ ((const));