From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 78271 invoked by alias); 16 Aug 2016 13:26:11 -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 78192 invoked by uid 9078); 16 Aug 2016 13:26:10 -0000 Date: Tue, 16 Aug 2016 13:26:00 -0000 Message-ID: <20160816132610.78189.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] Don't use locale_t in internal header X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: a86759837311871d99001bcc5211b15ee5442cc6 X-Git-Newrev: 7964ad15c17a477380e29cb9c275fa9f27682e53 X-SW-Source: 2016-q3/txt/msg00043.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7964ad15c17a477380e29cb9c275fa9f27682e53 commit 7964ad15c17a477380e29cb9c275fa9f27682e53 Author: Corinna Vinschen Date: Tue Aug 16 13:51:46 2016 +0200 Don't use locale_t in internal header Signed-off-by: Corinna Vinschen Diff: --- newlib/libc/locale/setlocale.h | 2 +- newlib/libc/stdlib/wcsnrtombs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/newlib/libc/locale/setlocale.h b/newlib/libc/locale/setlocale.h index de2bd67..03b1dd7 100644 --- a/newlib/libc/locale/setlocale.h +++ b/newlib/libc/locale/setlocale.h @@ -203,7 +203,7 @@ extern const char *__get_locale_env(struct _reent *, int); extern struct lconv *__localeconv_l (struct __locale_t *locale); extern size_t _wcsnrtombs_l (struct _reent *, char *, const wchar_t **, - size_t, size_t, mbstate_t *, locale_t); + size_t, size_t, mbstate_t *, struct __locale_t *); /* In POSIX terms the global locale is the process-wide locale. Use this function to always refer to the global locale. */ diff --git a/newlib/libc/stdlib/wcsnrtombs.c b/newlib/libc/stdlib/wcsnrtombs.c index 8ad8bcd..8e5c387 100644 --- a/newlib/libc/stdlib/wcsnrtombs.c +++ b/newlib/libc/stdlib/wcsnrtombs.c @@ -107,7 +107,7 @@ PORTABILITY size_t _wcsnrtombs_l (struct _reent *r, char *dst, const wchar_t **src, size_t nwc, - size_t len, mbstate_t *ps, locale_t loc) + size_t len, mbstate_t *ps, struct __locale_t *loc) { char *ptr = dst; char buff[10];