X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/3d9156a7a519a5e3aa1b92e9d9d4b991f1aed7ff..1f2f436a38f7ae2d39a943ad2898d8fed4ed2e58:/locale/FreeBSD/mskanji.c.patch

diff --git a/locale/FreeBSD/mskanji.c.patch b/locale/FreeBSD/mskanji.c.patch
index 998d30d..1399fa9 100644
--- a/locale/FreeBSD/mskanji.c.patch
+++ b/locale/FreeBSD/mskanji.c.patch
@@ -1,33 +1,28 @@
---- mskanji.c.orig	Thu Nov 25 11:38:18 2004
-+++ mskanji.c	Fri Feb 18 15:49:37 2005
-@@ -36,9 +36,12 @@
- #if defined(LIBC_SCCS) && !defined(lint)
- static char sccsid[] = "@(#)mskanji.c	1.0 (Phase One) 5/5/95";
- #endif /* LIBC_SCCS and not lint */
--#include <sys/param.h>
-+#include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.16 2004/05/14 15:40:47 tjr Exp $");
+--- mskanji.c.orig	2009-11-09 15:05:25.000000000 -0800
++++ mskanji.c	2009-11-09 16:30:02.000000000 -0800
+@@ -39,6 +39,8 @@ static char sccsid[] = "@(#)mskanji.c	1.
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.18 2007/10/13 16:28:22 ache Exp $");
  
 +#include "xlocale_private.h"
 +
-+#include <sys/param.h>
+ #include <sys/types.h>
  #include <errno.h>
  #include <runetype.h>
- #include <stdlib.h>
-@@ -46,38 +49,37 @@
+@@ -47,33 +49,30 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/
  #include <wchar.h>
  #include "mblocal.h"
  
--int	_MSKanji_init(_RuneLocale *);
--size_t	_MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
--	    mbstate_t * __restrict);
--int	_MSKanji_mbsinit(const mbstate_t *);
--size_t	_MSKanji_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
-+__private_extern__ int	_MSKanji_init(struct __xlocale_st_runelocale *);
-+static size_t	_MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
-+	    mbstate_t * __restrict, locale_t);
+-extern int __mb_sb_limit;
+-
+ static size_t	_MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict,
+-		    size_t, mbstate_t * __restrict);
+-static int	_MSKanji_mbsinit(const mbstate_t *);
++		    size_t, mbstate_t * __restrict, locale_t);
 +static int	_MSKanji_mbsinit(const mbstate_t *, locale_t);
-+static size_t	_MSKanji_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict, locale_t);
+ static size_t	_MSKanji_wcrtomb(char * __restrict, wchar_t,
+-		    mbstate_t * __restrict);
++		    mbstate_t * __restrict, locale_t);
  
  typedef struct {
  	wchar_t	ch;
@@ -44,38 +39,36 @@
 -	__mbsinit = _MSKanji_mbsinit;
 -	_CurrentRuneLocale = rl;
 -	__mb_cur_max = 2;
+-	__mb_sb_limit = 256;
 +	xrl->__mbrtowc = _MSKanji_mbrtowc;
 +	xrl->__wcrtomb = _MSKanji_wcrtomb;
 +	xrl->__mbsinit = _MSKanji_mbsinit;
 +	xrl->__mb_cur_max = 2;
++	xrl->__mb_sb_limit = 256;
  	return (0);
  }
  
--int
+ static int
 -_MSKanji_mbsinit(const mbstate_t *ps)
-+static int
-+_MSKanji_mbsinit(const mbstate_t *ps, locale_t loc)
++_MSKanji_mbsinit(const mbstate_t *ps, locale_t loc __unused)
  {
  
  	return (ps == NULL || ((const _MSKanjiState *)ps)->ch == 0);
- }
+@@ -81,7 +80,7 @@ _MSKanji_mbsinit(const mbstate_t *ps)
  
--size_t
-+static size_t
+ static size_t
  _MSKanji_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
 -    mbstate_t * __restrict ps)
-+    mbstate_t * __restrict ps, locale_t loc)
++    mbstate_t * __restrict ps, locale_t loc __unused)
  {
  	_MSKanjiState *ms;
  	wchar_t wc;
-@@ -133,8 +135,8 @@
- 	}
+@@ -138,7 +137,7 @@ _MSKanji_mbrtowc(wchar_t * __restrict pw
  }
  
--size_t
+ static size_t
 -_MSKanji_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-+static size_t
-+_MSKanji_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps, locale_t loc)
++_MSKanji_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps, locale_t loc __unused)
  {
  	_MSKanjiState *ms;
  	int len, i;