Don't include libio.h from the installed stdio.h.

  This patch removes the #include of libio.h from the installed stdio.h,
and eradicates all uses of _IO_ and _G_ symbols from public, standard
headers.  A few such names are preserved as struct tags to avoid
changing C++ mangled names.  A potentially surprising consequence is
that putc and getc are no longer macros; they were never _required_ to
be macros, and the macros just expanded to _IO_-prefixed names which
aliased back to the same functions.  Also, the awkward truth that we
require <stdarg.h> to define a type named __gnuc_va_list is now front
and center in stdio.h, instead of hidden behind a typedef.

Within glibc, however, libio.h is still pulled in as a side effect of
including stdio.h; this minimizes internal fallout from the change.
A couple of files in stdio-common that were unnecessarily redefining
standard symbols had to be adjusted.

libio.h and _G_config.h are still installed at this stage.  I am open
to the possibility of ceasing to install them altogether, but I think
that should be a separate patch.

This passes the testsuite on x86-64-linux-gnu.  A build-many-glibcs
cycle is in progress.

	* libio/bits/types/__fpos64_t.h, libio/bits/types/__fpos_t.h
	* libio/bits/types/cookie_io_functions_t.h: New single-type headers.
	* libio/bits/types/struct_FILE.h: New header containing the complete
	definitions of struct _IO_FILE and struct _IO_FILE_complete and a few
	ancillary definitions.
	* include/bits/types/__fpos64_t.h, include/bits/types/__fpos_t.h
	* include/bits/types/cookie_io_functions_t.h
        * include/bits/types/struct_FILE.h: New wrappers.
	* libio/Makefile: Install the new headers.

        * libio/stdio.h: Don't include bits/libio.h.  Don't define
        _STDIO_USES_IOSTREAM.  Declare __uflow and __overflow here.
        Get __gnuc_va_list directly from stdarg.h.  Get __fpos_t,
        __fpos64_t, and cookie_io_functions_t from the new headers.
        Don't use _G_ names when defining va_list, fpos_t, or fpos64_t.
        Define BUFSIZ unconditionally as 8192, and EOF unconditionally
        as (-1).  Declare stdin, stdout, and stderr with type FILE.
        Use cookie_io_functions_t instead of _IO_cookie_io_functions_t,
        __gnuc_va_list instead of _G_va_list, and __ssize_t instead of
        _IO_ssize_t.  Don't define getc or putc as macros.

	* libio/bits/stdio.h, libio/bits/stdio2.h: Use __ssize_t instead
	of _IO_ssize_t, and __gnuc_va_list instead of _G_va_list.
	* libio/bits/stdio.h: Add multiple inclusion guard.  Include
	bits/types/struct_FILE.h.  Use getc, not _IO_getc; putc, not _IO_putc;
	__getc_unlocked_body, not _IO_getc_unlocked; __putc_unlocked_body, not
	_IO_putc_unlocked; __feof_unlocked_body, not _IO_feof_unlocked;
	__ferror_unlocked_body, not _IO_ferror_unlocked.
	* libio/bits/stdio2.h: Add multiple inclusion guard.
        Use getc_unlocked, not _IO_getc_unlocked.
        * include/stdio.h: When _ISOMAC is not defined, include
        stdio-lock.h before libio/stdio.h, and bits/libio.h after.

        * libio/bits/libio.h: Include stdio.h and don't repeat
        anything that it does.  Permit direct inclusion by libio.h,
        iolibio.h, libioP.h, and include/stdio.h, but not by the
        installed stdio.h.  Define _IO_BUFSIZ as BUFSIZ, _IO_fpos_t as
        __fpos_t, _IO_fpos64_t as __fpos64_t, _IO_va_list as
        __gnuc_va_list, __io_read_fn as cookie_read_fn_t,
        __io_write_fn as cookie_write_fn_t, __io_seek_fn as
        cookie_seek_fn_t, __io_close_fn as cookie_close_fn_t, and
        _IO_cookie_io_functions_t as cookie_io_functions_t.
	Define _STDIO_USES_IOSTREAM here.  Move __HAVE_COLUMN and
	_IO_file_flags to the set of compatibility defines.
	Get definition of _IO_FILE and fallback definition of
	_IO_lock_t from bits/types/struct_FILE.h.  Use macros from
	bits/types/struct_FILE.h for _IO_getc_unlocked, _IO_putc_unlocked,
	_IO_feof_unlocked, and _IO_ferror_unlocked.
	Remove some #if 0 blocks and redundant prototypes.
        * libio/iolibio.h: Add a multiple include guard.
	Include bits/libio.h after stdio.h.
        * libioP.h: Add a multiple include guard.
	Include stdio.h and bits/libio.h before iolibio.h.

        * bits/_G_config.h, sysdeps/unix/sysv/linux/_G_config.h: Get
	definitions of __fpos_t and __fpos64_t from the new headers.
	Define _G_fpos_t as __fpos_t and _G_fpos64_t as __fpos64_t.

	* conform/data/stdio.h-data: Use __gnuc_va_list instead of _G_va_list.
        * stdio-common/tstgetln.c: Don't redefine ssize_t.
        * stdio-common/vfprintf.c: Don't redefine FILE, va_list, or BUFSIZ.
---
 NEWS                                       |  14 +-
 bits/_G_config.h                           |  16 +--
 conform/data/stdio.h-data                  |   2 +-
 include/bits/types/__fpos64_t.h            |   1 +
 include/bits/types/__fpos_t.h              |   1 +
 include/bits/types/cookie_io_functions_t.h |   1 +
 include/bits/types/struct_FILE.h           |   1 +
 include/stdio.h                            |   5 +
 libio/Makefile                             |   4 +-
 libio/bits/libio.h                         | 198 ++++-------------------------
 libio/bits/stdio.h                         |  35 +++--
 libio/bits/stdio2.h                        |  35 ++---
 libio/bits/types/__fpos64_t.h              |  16 +++
 libio/bits/types/__fpos_t.h                |  16 +++
 libio/bits/types/cookie_io_functions_t.h   |  46 +++++++
 libio/bits/types/struct_FILE.h             | 103 +++++++++++++++
 libio/iolibio.h                            |   6 +
 libio/libioP.h                             |   7 +
 libio/stdio.h                              | 101 +++++++--------
 stdio-common/tstgetln.c                    |   2 -
 stdio-common/vfprintf.c                    |   7 +-
 sysdeps/unix/sysv/linux/bits/_G_config.h   |  16 +--
 22 files changed, 343 insertions(+), 290 deletions(-)
 create mode 100644 include/bits/types/__fpos64_t.h
 create mode 100644 include/bits/types/__fpos_t.h
 create mode 100644 include/bits/types/cookie_io_functions_t.h
 create mode 100644 include/bits/types/struct_FILE.h
 create mode 100644 libio/bits/types/__fpos64_t.h
 create mode 100644 libio/bits/types/__fpos_t.h
 create mode 100644 libio/bits/types/cookie_io_functions_t.h
 create mode 100644 libio/bits/types/struct_FILE.h

Don't include libio.h from the installed stdio.h.

Commit Message

Comments

Patch