diff options
author | Zack Weinberg <zackw@panix.com> | 2016-11-20 23:00:02 -0500 |
---|---|---|
committer | Zack Weinberg <zackw@panix.com> | 2016-11-20 23:00:44 -0500 |
commit | 023131a22cbb7ae20cd285abbcd70568ae82cf55 (patch) | |
tree | 5874517f5b1c54e746bd46ec6dc26a36bf9ffee4 /stdio-common/printf.h | |
parent | b551190f039fcb74978f62f03632e53fac483ef1 (diff) | |
download | glibc-zack/string-headers-cleanups.tar.gz |
The bits/types/*.h treatment for stdio and wchar.zack/string-headers-cleanups
wint_t is a little finicky because it might be defined by stddef.h, which
belongs to the compiler.
In addition to the _types_, a bunch of other declarations shared between
wctype.h and wchar.h are factored out to their own header.
* libio/bits/types/FILE.h, libio/bits/types/__FILE.h
* wcsmbs/bits/types/mbstate_t.h, wcsmbs/bits/types/__mbstate_t.h
* wcsmbs/bits/types/wint_t.h: New single-type definition files.
* wctype/bits/wctype-wchar.h: New file holding declarations shared
between wctype.h and wchar.h.
* libio/Makefile, wcsmbs/Makefile, wctype/Makefile
Install them.
* include/bits/types/FILE.h, include/bits/types/__FILE.h
* include/bits/types/mbstate_t.h, include/bits/types/__mbstate_t.h
* include/bits/types/wint_t.h, include/bits/wcsmbs-wchar.h:
New wrappers.
* include/stdio.h, include/wchar.h, include/wctype.h:
No need to handle __need macros.
* grp/grp.h, gshadow/gshadow.h, hurd/hurd.h, iconv/gconv.h
* libio/stdio.h, mach/mach.h, misc/mntent.h, pwd/pwd.h
* shadow/shadow.h, stdio-common/printf.h, wcsmbs/uchar.h
* wcsmbs/wchar.h, wctype/wctype.h
* sysdeps/generic/_G_config.h, sysdeps/unix/sysv/linux/_G_config.h
Use the new files instead of __need macros.
Diffstat (limited to 'stdio-common/printf.h')
-rw-r--r-- | stdio-common/printf.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/stdio-common/printf.h b/stdio-common/printf.h index d731216197..e5073feab1 100644 --- a/stdio-common/printf.h +++ b/stdio-common/printf.h @@ -22,11 +22,12 @@ __BEGIN_DECLS -#define __need_FILE -#include <stdio.h> +#include <bits/types/FILE.h> + #define __need_size_t #define __need_wchar_t #include <stddef.h> + #include <stdarg.h> |