Libc-498.tar.gz

[apple/libc.git] / locale / FreeBSD / mblocal.h.patch

--- mblocal.h.orig	2004-11-25 11:38:18.000000000 -0800
+++ mblocal.h	2005-02-18 18:25:53.000000000 -0800
@@ -30,33 +30,21 @@
 #define	_MBLOCAL_H_
 
 /*
- * 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);
-
-/*
  * Conversion functions for "NONE"/C/POSIX encoding.
  */
 extern size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict,
-    size_t, mbstate_t * __restrict);
-extern int _none_mbsinit(const mbstate_t *);
+    size_t, mbstate_t * __restrict, locale_t);
+extern int _none_mbsinit(const mbstate_t *, locale_t);
 extern size_t _none_mbsnrtowcs(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 _none_wcrtomb(char * __restrict, wchar_t,
-    mbstate_t * __restrict);
+    mbstate_t * __restrict, locale_t);
 extern size_t _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
-    size_t, size_t, mbstate_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_ */