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 /include/stdio.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 'include/stdio.h')
| -rw-r--r-- | include/stdio.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/stdio.h b/include/stdio.h index cce55c82b1..c77e5b65fe 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -1,7 +1,6 @@ #ifndef _STDIO_H -# if defined __need_FILE || defined __need___FILE || defined _ISOMAC -# include <libio/stdio.h> -# else +# include <libio/stdio.h> +# ifndef _ISOMAC /* Force gets to be declared, since we may be compiling gets itself, or tests that use it. */ # include <features.h> @@ -76,11 +75,11 @@ libc_hidden_proto (__isoc99_vfscanf) extern FILE *__new_tmpfile (void); extern FILE *__old_tmpfile (void); - - # define __need_size_t -# define __need_wint_t # include <stddef.h> + +# include <bits/types/wint_t.h> + /* Generate a unique file name (and possibly open it). */ extern int __path_search (char *__tmpl, size_t __tmpl_len, const char *__dir, const char *__pfx, |