From: Corinna Vinschen <vinschen@redhat.com>
To: Brian Inglis <Brian.Inglis@SystematicSW.ab.ca>
Cc: newlib@sourceware.org
Subject: Re: [PATCH] add string.h(strerror_l) as POSIX, change string.h(str[n]casecmp_l) from POSIX to GNU, change strings.h(str[n]casecmp_l) from GNU to POSIX, use _EXFUN
Date: Thu, 25 Aug 2016 07:50:00 -0000 [thread overview]
Message-ID: <20160825075026.GA31185@calimero.vinschen.de> (raw)
In-Reply-To: <20160824203802.E51C2A803EE@calimero.vinschen.de>
[-- Attachment #1: Type: text/plain, Size: 2418 bytes --]
On Aug 24 14:36, Brian Inglis wrote:
> diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
> index 8f4fd2e..96703b5 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 _EXFUN(strcoll_l,(const char *, const char *, locale_t);
> +char *_EXFUN(strerror_l,(int, locale_t);
> +size_t _EXFUN(strxfrm_l,(char *__restrict, const char *__restrict, size_t, locale_t));
> +#endif
> +#if __GNU_VISIBLE
> +int _EXFUN(strcasecmp_l,(const char *, const char *, locale_t));
> +int _EXFUN(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..60e995b 100644
> --- a/newlib/libc/include/strings.h
> +++ b/newlib/libc/include/strings.h
> @@ -33,10 +33,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 _EXFUN(strcasecmp_l,(const char *, const char *, locale_t);
> +int _EXFUN(strncasecmp_l,(const char *, const char *, size_t, locale_t);
> +#endif /* __POSIX_VISIBLE >= 200809 */
>
> _END_STD_C
Applied with changes. The usage of _EXFUN for new declarations has been
deprecated, and strings.h was missing the include to get the definition
of locale_t.
I also fixed the log message a bit. The subject line was a teeny little
bit long :)
Thanks,
Corinna
--
Corinna Vinschen
Cygwin Maintainer
Red Hat
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next parent reply other threads:[~2016-08-25 7:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160824203802.E51C2A803EE@calimero.vinschen.de>
2016-08-25 7:50 ` Corinna Vinschen [this message]
2016-08-24 20:36 Brian Inglis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160825075026.GA31185@calimero.vinschen.de \
--to=vinschen@redhat.com \
--cc=Brian.Inglis@SystematicSW.ab.ca \
--cc=newlib@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).