diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2007-01-21 02:24:07 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2007-01-21 02:24:07 +0000 |
| commit | abfc5558bf4beb7dc381d93baaec4a9a3e4eba7b (patch) | |
| tree | 8763531b221e50bbbafb457cc1688e9ab4175516 /include/string.h | |
| parent | 293cef1de02c36f58a48bcdbe2d385059ea04828 (diff) | |
| download | uClibc-alpine-abfc5558bf4beb7dc381d93baaec4a9a3e4eba7b.tar.bz2 uClibc-alpine-abfc5558bf4beb7dc381d93baaec4a9a3e4eba7b.tar.xz | |
More merging from trunk.
Diffstat (limited to 'include/string.h')
| -rw-r--r-- | include/string.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/string.h b/include/string.h index dd5f23f2b..87d953449 100644 --- a/include/string.h +++ b/include/string.h @@ -321,8 +321,9 @@ extern char *index (__const char *__s, int __c) extern char *rindex (__const char *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); # else +# ifdef __UCLIBC_SUSV3_LEGACY_MACROS__ /* bcopy/bzero/bcmp/index/rindex are marked LEGACY in SuSv3. - * They are replaced as proposed by SuSv3. Don't sync this part + * They are replaced as proposed by SuSv3. Don't sync this part * with glibc and keep it in sync with strings.h. */ # define bcopy(src,dest,n) (memmove((dest), (src), (n)), (void) 0) @@ -330,6 +331,7 @@ extern char *rindex (__const char *__s, int __c) # define bcmp(s1,s2,n) memcmp((s1), (s2), (size_t)(n)) # define index(s,c) strchr((s), (c)) # define rindex(s,c) strrchr((s), (c)) +# endif # endif /* Return the position of the first bit set in I, or 0 if none are set. |