mblocal.h.patch   [plain text]

--- mblocal.h.orig	2009-11-09 15:05:25.000000000 -0800
+++ mblocal.h	2009-11-09 19:00:41.000000000 -0800
@@ -34,31 +34,31 @@
 /*
  * Rune initialization function prototypes.
  */
-int	_none_init(_RuneLocale *);
-int	_ascii_init(_RuneLocale *);
-int	_UTF8_init(_RuneLocale *);
-int	_EUC_init(_RuneLocale *);
-int	_GB18030_init(_RuneLocale *);
-int	_GB2312_init(_RuneLocale *);
-int	_GBK_init(_RuneLocale *);
-int	_BIG5_init(_RuneLocale *);
-int	_MSKanji_init(_RuneLocale *);
+__private_extern__ int	_none_init(struct __xlocale_st_runelocale *);
+__private_extern__ int	_ascii_init(struct __xlocale_st_runelocale *);
+__private_extern__ int	_UTF2_init(struct __xlocale_st_runelocale *);
+__private_extern__ int	_UTF8_init(struct __xlocale_st_runelocale *);
+__private_extern__ int	_EUC_init(struct __xlocale_st_runelocale *);
+__private_extern__ int	_GB18030_init(struct __xlocale_st_runelocale *);
+__private_extern__ int	_GB2312_init(struct __xlocale_st_runelocale *);
+__private_extern__ int	_GBK_init(struct __xlocale_st_runelocale *);
+__private_extern__ int	_BIG5_init(struct __xlocale_st_runelocale *);
+__private_extern__ int	_MSKanji_init(struct __xlocale_st_runelocale *);
 
-/*
- * Conversion function pointers for current encoding.
- */
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
-    size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict,
-    size_t, size_t, mbstate_t * __restrict);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
-extern size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict,
-    size_t, size_t, mbstate_t * __restrict);
+__private_extern__ size_t       _none_mbrtowc(wchar_t * __restrict, const char * __restrict,
+                    size_t, mbstate_t * __restrict, locale_t);
+__private_extern__ int  _none_mbsinit(const mbstate_t *, locale_t);
+__private_extern__ size_t       _none_mbsnrtowcs(wchar_t * __restrict dst,
+                    const char ** __restrict src, size_t nms, size_t len,
+                    mbstate_t * __restrict ps __unused, locale_t);
+__private_extern__ size_t       _none_wcrtomb(char * __restrict, wchar_t,
+                    mbstate_t * __restrict, locale_t);
+__private_extern__ size_t       _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
+                    size_t, size_t, mbstate_t * __restrict, locale_t);
 
 extern size_t __mbsnrtowcs_std(wchar_t * __restrict, const char ** __restrict,
-    size_t, size_t, mbstate_t * __restrict);
+    size_t, size_t, mbstate_t * __restrict, locale_t);
 extern size_t __wcsnrtombs_std(char * __restrict, const wchar_t ** __restrict,
-    size_t, size_t, mbstate_t * __restrict);
+    size_t, size_t, mbstate_t * __restrict, locale_t);
 
 #endif	/* _MBLOCAL_H_ */