From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21736 invoked by alias); 25 Aug 2016 07:46:34 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 21670 invoked by uid 9078); 25 Aug 2016 07:46:33 -0000 Date: Thu, 25 Aug 2016 07:46:00 -0000 Message-ID: <20160825074633.21668.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Add strerror_l prototype, change str[n]casecmp_l feature tests X-Act-Checkin: newlib-cygwin X-Git-Author: Brian Inglis X-Git-Refname: refs/heads/master X-Git-Oldrev: a703d64ad7edac344e4959e8d624ce1d8012678b X-Git-Newrev: 448b46397dcea17e97783b0311b6d9af6878001c X-SW-Source: 2016-q3/txt/msg00072.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=448b46397dcea17e97783b0311b6d9af6878001c commit 448b46397dcea17e97783b0311b6d9af6878001c Author: Brian Inglis Date: Wed Aug 24 14:36:31 2016 -0600 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. Diff: --- newlib/libc/include/string.h | 13 +++++++------ 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 8f4fd2e..ba5e51e 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 b462d07..be01958 100644 --- a/newlib/libc/include/strings.h +++ b/newlib/libc/include/strings.h @@ -15,6 +15,10 @@ #include #include /* for size_t */ +#if __POSIX_VISIBLE >= 200809 +#include +#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