Loading...
stdio/FreeBSD/local.h.patch Libc-498 Libc-594.9.4
--- Libc/Libc-498/stdio/FreeBSD/local.h.patch
+++ Libc/Libc-594.9.4/stdio/FreeBSD/local.h.patch
@@ -1,5 +1,5 @@
---- local.h.orig	2004-11-25 11:38:35.000000000 -0800
-+++ local.h	2005-02-23 17:26:30.000000000 -0800
+--- 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 $
   */
@@ -12,7 +12,7 @@
  #include <string.h>
  #include <wchar.h>
  
-@@ -53,8 +56,8 @@
+@@ -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);
@@ -21,9 +21,17 @@
 +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(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);
-@@ -69,16 +72,16 @@
+ 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 *));
@@ -47,7 +55,17 @@
  
  extern int	__sdidinit;
  
-@@ -124,7 +127,7 @@
+@@ -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; \