locale/FreeBSD/mblocal.h.patch

   1 --- mblocal.h.orig      2004-11-25 11:38:18.000000000 -0800
   2 +++ mblocal.h   2005-02-18 18:25:53.000000000 -0800
   3 @@ -30,33 +30,21 @@
   4  #define        _MBLOCAL_H_
   5
   6  /*
   7 - * Conversion function pointers for current encoding.
   8 - */
   9 -extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
  10 -    size_t, mbstate_t * __restrict);
  11 -extern int (*__mbsinit)(const mbstate_t *);
  12 -extern size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict,
  13 -    size_t, size_t, mbstate_t * __restrict);
  14 -extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
  15 -extern size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict,
  16 -    size_t, size_t, mbstate_t * __restrict);
  17 -
  18 -/*
  19   * Conversion functions for "NONE"/C/POSIX encoding.
  20   */
  21  extern size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict,
  22 -    size_t, mbstate_t * __restrict);
  23 -extern int _none_mbsinit(const mbstate_t *);
  24 +    size_t, mbstate_t * __restrict, locale_t);
  25 +extern int _none_mbsinit(const mbstate_t *, locale_t);
  26  extern size_t _none_mbsnrtowcs(wchar_t * __restrict, const char ** __restrict,
  27 -    size_t, size_t, mbstate_t * __restrict);
  28 +    size_t, size_t, mbstate_t * __restrict, locale_t);
  29  extern size_t _none_wcrtomb(char * __restrict, wchar_t,
  30 -    mbstate_t * __restrict);
  31 +    mbstate_t * __restrict, locale_t);
  32  extern size_t _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
  33 -    size_t, size_t, mbstate_t * __restrict);
  34 +    size_t, size_t, mbstate_t * __restrict, locale_t);
  35
  36  extern size_t __mbsnrtowcs_std(wchar_t * __restrict, const char ** __restrict,
  37 -    size_t, size_t, mbstate_t * __restrict);
  38 +    size_t, size_t, mbstate_t * __restrict, locale_t);
  39  extern size_t __wcsnrtombs_std(char * __restrict, const wchar_t ** __restrict,
  40 -    size_t, size_t, mbstate_t * __restrict);
  41 +    size_t, size_t, mbstate_t * __restrict, locale_t);
  42
  43  #endif /* _MBLOCAL_H_ */