[newlib-cygwin] Don't use locale_t in internal header

Corinna Vinschen corinna@sourceware.org
Tue Aug 16 13:26:00 GMT 2016


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7964ad15c17a477380e29cb9c275fa9f27682e53

commit 7964ad15c17a477380e29cb9c275fa9f27682e53
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Tue Aug 16 13:51:46 2016 +0200

    Don't use locale_t in internal header
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

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];



More information about the Newlib-cvs mailing list