diff options
| author | Zack Weinberg <zackw@panix.com> | 2018-02-05 13:09:15 -0500 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2018-02-07 10:09:47 -0500 |
| commit | 6c6c962a202299b55d180e04f44a63ffb748096c (patch) | |
| tree | 53410dbb50fa6bc4063dc27b628d6be5b4dde34f /include/stdio.h | |
| parent | a4fea3f2c3253b9ae6ffacd3747034ccbe56bc60 (diff) | |
Post-cleanup 1: move libio.h back out of bits/.
We can't go very far with libio cleanups as long as we still have
_IO_MTSAFE_IO, and I am not tackling that in this patch series,
but we can at least make the maze of stdio-related headers a
little less complicated.
In this patch, libio.h moves back out of bits/ into the top level of
the libio subdirectory, and is merged with libio/bits/libio-ldbl.h
(which also used to be installed) and include/libio.h. Since almost
no files include libio.h directly, this is quite straightforward.
libio.h is now always used with _LIBC defined, so all of the _LIBC ||
_GLIBCPP_USE_WCHAR_T conditionals are unnecessary. Similarly, the
ifdef nest surrounding the definition of _IO_fwide_maybe_incompatible
can collapse down to a single SHLIB_COMPAT check. I also took the
opportunity to add some checks for configuration botches to libio.h.
Installed stripped libraries are unchanged by this patch.
* libio/bits/libio.h: Move back to libio/libio.h and adjust
multiple-include guard to match.
Merge contents of libio/bits/libio-ldbl.h and include/libio.h
into this file.
Remove preprocessor conditionals that are always true and/or
redundant to other preprocessor conditionals in the same nest.
Include shlib-compat.h unconditionally.
Error out if _LIBC is not defined, or if _ISOMAC is defined,
or if _IO_MTSAFE_IO is defined but _IO_lock_t_defined is not
defined after including stdio.h.
Use __BEGIN_DECLS/__END_DECLS.
* libio/bits/libio-ldbl.h, include/bits/libio.h: Delete file.
* include/stdio.h, libio/iolibio.h, libio/libioP.h: Include
libio.h as <libio/libio.h> rather than as <bits/libio.h>.
Diffstat (limited to 'include/stdio.h')
| -rw-r--r-- | include/stdio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/stdio.h b/include/stdio.h index 3b6da17d82..f12b281b4d 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -5,7 +5,7 @@ # include <libio/stdio.h> # ifndef _ISOMAC # define _LIBC_STDIO_H 1 -# include <bits/libio.h> +# include <libio/libio.h> /* Now define the internal interfaces. */ |