diff options
| author | Zack Weinberg <zackw@panix.com> | 2016-11-20 23:00:02 -0500 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2017-06-08 13:58:17 -0400 |
| commit | 199fc19d3aaaf57944ef036e15904febe877fc93 (patch) | |
| tree | 5056d2447de58c0bb197d87740098220f556b242 /iconv | |
| parent | 4615f5aefeaa45345484a9ce8e3d0ea977c80d80 (diff) | |
| download | glibc-199fc19d3aaaf57944ef036e15904febe877fc93.zip glibc-199fc19d3aaaf57944ef036e15904febe877fc93.tar.gz glibc-199fc19d3aaaf57944ef036e15904febe877fc93.tar.bz2 | |
Remove __need macros from stdio.h and wchar.h.
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 'iconv')
| -rw-r--r-- | iconv/gconv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/iconv/gconv.h b/iconv/gconv.h index 71d91a0..db678db 100644 --- a/iconv/gconv.h +++ b/iconv/gconv.h @@ -23,9 +23,9 @@ #define _GCONV_H 1 #include <features.h> -#define __need_mbstate_t -#define __need_wint_t -#include <wchar.h> +#include <bits/types/__mbstate_t.h> +#include <bits/types/wint_t.h> + #define __need_size_t #define __need_wchar_t #include <stddef.h> |