diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-01-14 16:16:21 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-01-14 16:16:21 -0800 |
| commit | cd5c5f7051b72c57cf77c03f55f774776a2fd920 (patch) | |
| tree | cc73262eee6371c9da91874c32f47345c0ff219a | |
| parent | c589e093e17a46c659a79f09d766f301ef8ef64f (diff) | |
| download | glibc-cd5c5f7051b72c57cf77c03f55f774776a2fd920.tar.gz glibc-cd5c5f7051b72c57cf77c03f55f774776a2fd920.tar.xz glibc-cd5c5f7051b72c57cf77c03f55f774776a2fd920.zip | |
Relax onditions in strings.h.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | string/strings.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 9b078a0236..6a9f5b246b 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 a3dde714f3..2ab83caa06 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)); |