1 --- local.h.orig 2004-11-25 11:38:35.000000000 -0800
2 +++ local.h 2005-02-23 17:26:30.000000000 -0800
4 * $FreeBSD: src/lib/libc/stdio/local.h,v 1.26 2004/07/16 05:52:51 tjr Exp $
7 +#include <sys/cdefs.h>
8 +#include "xlocale_private.h"
9 #include <sys/types.h> /* for off_t */
16 extern int _ftello(FILE *, fpos_t *);
17 extern int _fseeko(FILE *, off_t, int, int);
18 extern int __fflush(FILE *fp);
19 -extern wint_t __fgetwc(FILE *);
20 -extern wint_t __fputwc(wchar_t, FILE *);
21 +extern wint_t __fgetwc(FILE *, locale_t);
22 +extern wint_t __fputwc(wchar_t, FILE *, locale_t);
23 extern int __sflush(FILE *);
24 extern FILE *__sfp(void);
25 extern int __slbexpand(FILE *, size_t);
27 extern void __smakebuf(FILE *);
28 extern int __swhatbuf(FILE *, size_t *, int *);
29 extern int _fwalk(int (*)(FILE *));
30 -extern int __svfscanf(FILE *, const char *, __va_list);
31 +extern int __svfscanf_l(FILE *, locale_t, const char *, __va_list) __DARWIN_LDBL_COMPAT(__svfscanf_l);
32 extern int __swsetup(FILE *);
33 extern int __sflags(const char *, int *);
34 extern int __ungetc(int, FILE *);
35 -extern wint_t __ungetwc(wint_t, FILE *);
36 -extern int __vfprintf(FILE *, const char *, __va_list);
37 -extern int __vfscanf(FILE *, const char *, __va_list);
38 -extern int __vfwprintf(FILE *, const wchar_t *, __va_list);
39 -extern int __vfwscanf(FILE * __restrict, const wchar_t * __restrict,
41 +extern wint_t __ungetwc(wint_t, FILE *, locale_t);
42 +extern int __vfprintf(FILE *, locale_t, const char *, __va_list) __DARWIN_LDBL_COMPAT(__vfprintf);
43 +extern int __vfscanf(FILE *, const char *, __va_list) __DARWIN_LDBL_COMPAT(__vfscanf);
44 +extern int __vfwprintf(FILE *, locale_t, const wchar_t *, __va_list) __DARWIN_LDBL_COMPAT(__vfwprintf);
45 +extern int __vfwscanf(FILE * __restrict, locale_t, const wchar_t * __restrict,
46 + __va_list) __DARWIN_LDBL_COMPAT(__vfwscanf);
48 extern int __sdidinit;
52 #define INITEXTRA(fp) { \
53 (fp)->_extra->_up = NULL; \
54 - (fp)->_extra->fl_mutex = PTHREAD_MUTEX_INITIALIZER; \
55 + (fp)->_extra->fl_mutex = (pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER; \
56 (fp)->_extra->fl_owner = NULL; \
57 (fp)->_extra->fl_count = 0; \
58 (fp)->_extra->orientation = 0; \