diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-11-29 21:12:13 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-11-29 21:12:13 +0000 |
| commit | 589c9895a47f608d6f7333dba3d7b449baf4b374 (patch) | |
| tree | a7716b3e44059fccb058fba45f30ab5b061fb2a1 | |
| parent | 2c20597657d269d5f61592278d589dd35cd040f2 (diff) | |
- introduce UCLIBC_SUSV3_LEGACY_MACROS to be able to do away with all LEGACY
stuff, even the fallback defines.
| -rw-r--r-- | extra/Configs/Config.in | 8 | ||||
| -rw-r--r-- | include/string.h | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index fcf64c509..b3d9250f0 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -462,6 +462,14 @@ config UCLIBC_SUSV3_LEGACY Currently applies to bcopy/bzero/bcmp/index/rindex. WARNING! ABI incompatibility. +config UCLIBC_SUSV3_LEGACY_MACROS + bool "Enable SuSv3 LEGACY macros" + default n + help + Enable this option if you want to have SuSv3 LEGACY macros. + Currently applies to bcopy/bzero/bcmp/index/rindex et al. + WARNING! ABI incompatibility. + config UCLIBC_HAS_SHADOW bool "Shadow Password Support" default y 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. |