mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-14 12:23:58 +00:00
Unbreak build: gnu sort has been configured to grope inside struct
__sFILE. It's opaque now, so add a function that returns the pending output bytes. Pointy hat: jhb
This commit is contained in:
parent
e1e27ead34
commit
0aca787a7b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=178755
|
@ -1240,7 +1240,7 @@
|
||||||
#define PACKAGE_VERSION "5.3.0-20040812-FreeBSD"
|
#define PACKAGE_VERSION "5.3.0-20040812-FreeBSD"
|
||||||
|
|
||||||
/* the number of pending output bytes on stream `fp' */
|
/* the number of pending output bytes on stream `fp' */
|
||||||
#define PENDING_OUTPUT_N_BYTES fp->_p - fp->_bf._base
|
#define PENDING_OUTPUT_N_BYTES __fgetpendout(fp)
|
||||||
|
|
||||||
/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
|
/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
|
||||||
/* #undef PRI_MACROS_BROKEN */
|
/* #undef PRI_MACROS_BROKEN */
|
||||||
|
|
|
@ -249,8 +249,11 @@ int setlinebuf(FILE *);
|
||||||
int vasprintf(char **, const char *, __va_list)
|
int vasprintf(char **, const char *, __va_list)
|
||||||
__printflike(2, 0);
|
__printflike(2, 0);
|
||||||
|
|
||||||
|
/* XXX used by libftpio */
|
||||||
void *__fgetcookie(FILE *);
|
void *__fgetcookie(FILE *);
|
||||||
void __fsetfileno(FILE *, int);
|
void __fsetfileno(FILE *, int);
|
||||||
|
/* XXX used by sort */
|
||||||
|
size_t __fgetpendout(FILE *);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The system error table contains messages for the first sys_nerr
|
* The system error table contains messages for the first sys_nerr
|
||||||
|
|
|
@ -53,6 +53,13 @@ __fgetcookie(FILE *fp)
|
||||||
return (fp->_cookie);
|
return (fp->_cookie);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
size_t
|
||||||
|
__fgetpendout(FILE *fp)
|
||||||
|
{
|
||||||
|
|
||||||
|
return (fp->_p - fp->_bf._base);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
__fsetfileno(FILE *fp, int fd)
|
__fsetfileno(FILE *fp, int fd)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue