--- Libc/Libc-1725.40.4/stdio/FreeBSD/local.h
+++ Libc/Libc-391/stdio/FreeBSD/local.h
@@ -13,6 +13,10 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -30,15 +34,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)local.h	8.3 (Berkeley) 7/3/94
- * $FreeBSD: src/lib/libc/stdio/local.h,v 1.33 2008/05/05 16:03:52 jhb Exp $
+ * $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 "xprintf_private.h"
 #include <sys/types.h>	/* for off_t */
 #include <pthread.h>
-#include <limits.h>
 #include <string.h>
 #include <wchar.h>
 
@@ -52,84 +52,46 @@
 extern fpos_t	_sseek(FILE *, fpos_t, int);
 extern int	_ftello(FILE *, fpos_t *);
 extern int	_fseeko(FILE *, off_t, int, int);
-extern int	_vasprintf(printf_comp_t __restrict, printf_domain_t __restrict,
-		char ** __restrict, locale_t __restrict,
-		const char * __restrict, __va_list);
-extern int	_vdprintf(printf_comp_t __restrict, printf_domain_t __restrict,
-		int, locale_t __restrict, const char * __restrict, va_list);
-extern int	_vsnprintf(printf_comp_t __restrict, printf_domain_t __restrict,
-		char * __restrict, size_t n, locale_t __restrict,
-		const char * __restrict, __va_list);
-
 extern int	__fflush(FILE *fp);
-extern void	__fcloseall(void);
-extern wint_t	__fgetwc(FILE *, locale_t);
-extern wint_t	__fputwc(wchar_t, FILE *, locale_t);
+extern wint_t	__fgetwc(FILE *);
+extern wint_t	__fputwc(wchar_t, FILE *);
 extern int	__sflush(FILE *);
-extern FILE	*__sfp(int);
-extern void	__sfprelease(FILE *);	/* mark free and update count as needed */
+extern FILE	*__sfp(void);
 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);
 extern int	__sclose(void *);
 extern void	__sinit(void);
-#if __has_feature(ptrauth_calls)
-#define CLEANUP_PTRAUTH __ptrauth(ptrauth_key_process_dependent_code, true, ptrauth_string_discriminator("libc.cleanup"))
-#else
-#define CLEANUP_PTRAUTH
-#endif
 extern void	_cleanup(void);
-#ifdef __APPLE__
-extern int	__cleanup;
-#else
-extern void    (* CLEANUP_PTRAUTH __cleanup)(void);
-#endif // __APPLE__
+extern void	(*__cleanup)(void);
 extern void	__smakebuf(FILE *);
 extern int	__swhatbuf(FILE *, size_t *, int *);
 extern int	_fwalk(int (*)(FILE *));
-extern int	__svfscanf_l(FILE *, locale_t, const char *, __va_list);
+extern int	__svfscanf(FILE *, const char *, __va_list);
 extern int	__swsetup(FILE *);
 extern int	__sflags(const char *, int *);
 extern int	__ungetc(int, FILE *);
-extern wint_t	__ungetwc(wint_t, FILE *, locale_t);
-extern int	__vfprintf(FILE *, locale_t, const char *, __va_list);
+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 *, locale_t, const wchar_t *, __va_list);
-extern int	__vfwscanf(FILE * __restrict, locale_t, const wchar_t * __restrict,
+extern int	__vfwprintf(FILE *, const wchar_t *, __va_list);
+extern int	__vfwscanf(FILE * __restrict, const wchar_t * __restrict,
 		    __va_list);
-extern size_t	__fread(void * __restrict buf, size_t size, size_t count,
-		FILE * __restrict fp);
-extern pthread_once_t	__sdidinit;
+
+extern int	__sdidinit;
 
 
 /* hold a buncha junk that would grow the ABI */
 struct __sFILEX {
-	unsigned char	*up;	/* saved _p when _p is doing ungetc data */
+	unsigned char	*_up;	/* saved _p when _p is doing ungetc data */
 	pthread_mutex_t	fl_mutex;	/* used for MT-safety */
-	int		orientation:3;	/* orientation for fwide() */
-	u_int		counted:1;	/* stream counted against STREAM_MAX */
+	pthread_t	fl_owner;	/* current owner */
+	int		fl_count;	/* recursive lock count */
+	int		orientation;	/* orientation for fwide() */
 	mbstate_t	mbstate;	/* multibyte conversion state */
 };
-
-#define _up 		_extra->up
-#define _fl_mutex	_extra->fl_mutex
-#define _orientation	_extra->orientation
-#define _mbstate	_extra->mbstate
-#define _counted	_extra->counted
-
-
-
-#define	INITEXTRA(fp) do { \
-	(fp)->_extra->up = NULL; \
-	(fp)->_extra->fl_mutex = (pthread_mutex_t)PTHREAD_RECURSIVE_MUTEX_INITIALIZER; \
-	(fp)->_extra->orientation = 0; \
-	memset(&(fp)->_extra->mbstate, 0, sizeof(mbstate_t)); \
-	(fp)->_extra->counted = 0; \
-} while(0);
 
 /*
  * Prepare the given FILE for writing, and return 0 iff it
@@ -160,11 +122,20 @@
 	(fp)->_lb._base = NULL; \
 }
 
+#define	INITEXTRA(fp) { \
+	(fp)->_extra->_up = NULL; \
+	(fp)->_extra->fl_mutex = PTHREAD_MUTEX_INITIALIZER; \
+	(fp)->_extra->fl_owner = NULL; \
+	(fp)->_extra->fl_count = 0; \
+	(fp)->_extra->orientation = 0; \
+	memset(&(fp)->_extra->mbstate, 0, sizeof(mbstate_t)); \
+}
+
 /*
  * Set the orientation for a stream. If o > 0, the stream has wide-
  * orientation. If o < 0, the stream has byte-orientation.
  */
 #define	ORIENT(fp, o)	do {				\
-	if ((fp)->_orientation == 0)			\
-		(fp)->_orientation = (o);		\
+	if ((fp)->_extra->orientation == 0)		\
+		(fp)->_extra->orientation = (o);	\
 } while (0)