Loading...
stdio/FreeBSD/local.h.patch Libc-320.1.3 Libc-583
--- Libc/Libc-320.1.3/stdio/FreeBSD/local.h.patch
+++ Libc/Libc-583/stdio/FreeBSD/local.h.patch
@@ -1,6 +1,71 @@
---- local.h.orig	Fri Oct 25 00:01:56 2002
-+++ local.h	Sat May  3 14:38:49 2003
-@@ -130,7 +130,7 @@
+--- local.h.orig	2009-02-15 03:11:22.000000000 -0800
++++ local.h	2009-02-15 18:12:54.000000000 -0800
+@@ -37,8 +37,11 @@
+  * $FreeBSD: src/lib/libc/stdio/local.h,v 1.26 2004/07/16 05:52:51 tjr Exp $
+  */
+ 
++#include <sys/cdefs.h>
++#include "xlocale_private.h"
+ #include <sys/types.h>	/* for off_t */
+ #include <pthread.h>
++#include <limits.h>
+ #include <string.h>
+ #include <wchar.h>
+ 
+@@ -53,12 +56,15 @@ extern fpos_t	_sseek(FILE *, fpos_t, int
+ extern int	_ftello(FILE *, fpos_t *);
+ extern int	_fseeko(FILE *, off_t, int, int);
+ extern int	__fflush(FILE *fp);
+-extern wint_t	__fgetwc(FILE *);
+-extern wint_t	__fputwc(wchar_t, FILE *);
++extern wint_t	__fgetwc(FILE *, locale_t);
++extern wint_t	__fputwc(wchar_t, FILE *, locale_t);
+ extern int	__sflush(FILE *);
+-extern FILE	*__sfp(void);
++extern FILE	*__sfp(int);		/* arg is whether to count against STREAM_MAX or not */
++extern void	__sfprelease(FILE *);	/* mark free and update count as needed */
+ extern int	__slbexpand(FILE *, size_t);
+ extern int	__srefill(FILE *);
++extern int	__srefill0(FILE *);
++extern int	__srefill1(FILE *);
+ extern int	__sread(void *, char *, int);
+ extern int	__swrite(void *, char const *, int);
+ extern fpos_t	__sseek(void *, fpos_t, int);
+@@ -69,16 +75,16 @@ extern void	(*__cleanup)(void);
+ extern void	__smakebuf(FILE *);
+ extern int	__swhatbuf(FILE *, size_t *, int *);
+ extern int	_fwalk(int (*)(FILE *));
+-extern int	__svfscanf(FILE *, const char *, __va_list);
++extern int	__svfscanf_l(FILE *, locale_t, const char *, __va_list) __DARWIN_LDBL_COMPAT(__svfscanf_l);
+ extern int	__swsetup(FILE *);
+ extern int	__sflags(const char *, int *);
+ extern int	__ungetc(int, FILE *);
+-extern wint_t	__ungetwc(wint_t, FILE *);
+-extern int	__vfprintf(FILE *, const char *, __va_list);
+-extern int	__vfscanf(FILE *, const char *, __va_list);
+-extern int	__vfwprintf(FILE *, const wchar_t *, __va_list);
+-extern int	__vfwscanf(FILE * __restrict, const wchar_t * __restrict,
+-		    __va_list);
++extern wint_t	__ungetwc(wint_t, FILE *, locale_t);
++extern int	__vfprintf(FILE *, locale_t, const char *, __va_list) __DARWIN_LDBL_COMPAT(__vfprintf);
++extern int	__vfscanf(FILE *, const char *, __va_list) __DARWIN_LDBL_COMPAT(__vfscanf);
++extern int	__vfwprintf(FILE *, locale_t, const wchar_t *, __va_list) __DARWIN_LDBL_COMPAT(__vfwprintf);
++extern int	__vfwscanf(FILE * __restrict, locale_t, const wchar_t * __restrict,
++		    __va_list) __DARWIN_LDBL_COMPAT(__vfwscanf);
+ 
+ extern int	__sdidinit;
+ 
+@@ -89,7 +95,8 @@ struct __sFILEX {
+ 	pthread_mutex_t	fl_mutex;	/* used for MT-safety */
+ 	pthread_t	fl_owner;	/* current owner */
+ 	int		fl_count;	/* recursive lock count */
+-	int		orientation;	/* orientation for fwide() */
++	int		orientation:2;	/* orientation for fwide() */
++	int		counted:1;	/* stream counted against STREAM_MAX */
+ 	mbstate_t	mbstate;	/* multibyte conversion state */
+ };
+ 
+@@ -124,7 +131,7 @@ struct __sFILEX {
  
  #define	INITEXTRA(fp) { \
  	(fp)->_extra->_up = NULL; \