diff options
author | Brian Inglis <Brian.Inglis@SystematicSW.ab.ca> | 2016-08-24 23:36:31 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2016-08-25 10:44:31 +0300 |
commit | 448b46397dcea17e97783b0311b6d9af6878001c (patch) | |
tree | 6c4417226ddace86f9c9a5d17975887d35791ade | |
parent | a703d64ad7edac344e4959e8d624ce1d8012678b (diff) |
Add strerror_l prototype, change str[n]casecmp_l feature tests
strerror_l prototype was missing.
str[n]casecmp_l feature tests in string.h vs. strings.h were transposed.
-rw-r--r-- | newlib/libc/include/string.h | 13 | ||||
-rw-r--r-- | newlib/libc/include/strings.h | 12 |
2 files changed, 15 insertions, 10 deletions
diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h index 8f4fd2e20..ba5e51ee7 100644 --- a/newlib/libc/include/string.h +++ b/newlib/libc/include/string.h @@ -48,13 +48,14 @@ char *_EXFUN(strtok,(char *__restrict, const char *__restrict)); size_t _EXFUN(strxfrm,(char *__restrict, const char *__restrict, size_t)); #if __POSIX_VISIBLE >= 200809 -extern int strcasecmp_l (const char *, const char *, locale_t); -extern int strncasecmp_l (const char *, const char *, size_t, locale_t); -extern int strcoll_l (const char *, const char *, locale_t); -extern size_t strxfrm_l (char *__restrict, const char *__restrict, size_t, - locale_t); +int strcoll_l (const char *, const char *, locale_t); +char *strerror_l (int, locale_t); +size_t strxfrm_l (char *__restrict, const char *__restrict, size_t, locale_t); +#endif +#if __GNU_VISIBLE +int strcasecmp_l (const char *, const char *, locale_t); +int strncasecmp_l (const char *, const char *, size_t, locale_t); #endif - #if __MISC_VISIBLE || __POSIX_VISIBLE char *_EXFUN(strtok_r,(char *__restrict, const char *__restrict, char **__restrict)); #endif diff --git a/newlib/libc/include/strings.h b/newlib/libc/include/strings.h index b462d07f8..be019581c 100644 --- a/newlib/libc/include/strings.h +++ b/newlib/libc/include/strings.h @@ -15,6 +15,10 @@ #include <sys/cdefs.h> #include <sys/types.h> /* for size_t */ +#if __POSIX_VISIBLE >= 200809 +#include <sys/_locale.h> +#endif + _BEGIN_STD_C #if __BSD_VISIBLE || (__POSIX_VISIBLE && __POSIX_VISIBLE < 200809) @@ -33,10 +37,10 @@ int _EXFUN(ffs,(int)); int _EXFUN(strcasecmp,(const char *, const char *)); int _EXFUN(strncasecmp,(const char *, const char *, size_t)); -#if __GNU_VISIBLE -extern int strcasecmp_l (const char *, const char *, locale_t); -extern int strncasecmp_l (const char *, const char *, size_t, locale_t); -#endif /* _GNU_VISIBLE */ +#if __POSIX_VISIBLE >= 200809 +int strcasecmp_l (const char *, const char *, locale_t); +int strncasecmp_l (const char *, const char *, size_t, locale_t); +#endif /* __POSIX_VISIBLE >= 200809 */ _END_STD_C |