Libc-763.11.tar.gz

[apple/libc.git] / stdio / FreeBSD / local.h.patch

diff --git a/stdio/FreeBSD/local.h.patch b/stdio/FreeBSD/local.h.patch
index dd295b7ec6006bdbfdd2734df43a819ca0b870e4..2024f06a21a60a75ac3fac4bde5a4fa0402368ea 100644 (file)
--- a/stdio/FreeBSD/local.h.patch
+++ b/stdio/FreeBSD/local.h.patch
@@ -1,7 +1,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 $
+--- local.h.orig       2011-02-15 10:44:57.000000000 -0800
++++ local.h    2011-02-15 11:16:59.000000000 -0800
+@@ -33,8 +33,11 @@
+  * $FreeBSD: src/lib/libc/stdio/local.h,v 1.33 2008/05/05 16:03:52 jhb Exp $

   */
  
 +#include <sys/cdefs.h>
   */
  
 +#include <sys/cdefs.h>


@@ -12,17 +12,17 @@
  #include <string.h>
  #include <wchar.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 *);
+@@ -50,36 +53,69 @@

  extern int    _fseeko(FILE *, off_t, int, int);
  extern int    __fflush(FILE *fp);
  extern int    _fseeko(FILE *, off_t, int, int);
  extern int    __fflush(FILE *fp);

+ extern void   __fcloseall(void);

 -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 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 FILE   *__sfp(int);

 +extern void   __sfprelease(FILE *);   /* mark free and update count as needed */
  extern int    __slbexpand(FILE *, size_t);
  extern int    __srefill(FILE *);
 +extern void   __sfprelease(FILE *);   /* mark free and update count as needed */
  extern int    __slbexpand(FILE *, size_t);
  extern int    __srefill(FILE *);


@@ -31,7 +31,10 @@
  extern int    __sread(void *, char *, int);
  extern int    __swrite(void *, char const *, int);
  extern fpos_t __sseek(void *, fpos_t, int);
  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 int    __sclose(void *);
+ extern void   __sinit(void);
+ extern void   _cleanup(void);
++extern void   (*__cleanup)(void);

  extern void   __smakebuf(FILE *);
  extern int    __swhatbuf(FILE *, size_t *, int *);
  extern int    _fwalk(int (*)(FILE *));
  extern void   __smakebuf(FILE *);
  extern int    __swhatbuf(FILE *, size_t *, int *);
  extern int    _fwalk(int (*)(FILE *));


@@ -52,25 +55,40 @@
 +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    __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 size_t __fread(void * __restrict buf, size_t size, size_t count,
+               FILE * __restrict fp);

  extern int    __sdidinit;
  
  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() */
+ 
++/* hold a buncha junk that would grow the ABI */
++struct __sFILEX {
++      unsigned char   *up;    /* saved _p when _p is doing ungetc data */
++      pthread_mutex_t fl_mutex;       /* used for MT-safety */
++      pthread_t       fl_owner;       /* current owner */
++      int             fl_count;       /* recursive lock count */

 +      int             orientation:2;  /* orientation for fwide() */
 +      int             counted:1;      /* stream counted against STREAM_MAX */
 +      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; \
--      (fp)->_extra->fl_mutex = PTHREAD_MUTEX_INITIALIZER; \
++      mbstate_t       mbstate;        /* multibyte conversion state */
++};
++
++#define _up           _extra->up
++#define _fl_mutex     _extra->fl_mutex
++#define _fl_owner     _extra->fl_owner
++#define _fl_count     _extra->fl_count
++#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_MUTEX_INITIALIZER; \
 +      (fp)->_extra->fl_mutex = (pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER; \

-       (fp)->_extra->fl_owner = NULL; \
-       (fp)->_extra->fl_count = 0; \
-       (fp)->_extra->orientation = 0; \
++      (fp)->_extra->fl_owner = NULL; \
++      (fp)->_extra->fl_count = 0; \
++      (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
+  * can be written now.  Otherwise, return EOF and set errno.