diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bits/types/FILE.h | 1 | ||||
| -rw-r--r-- | include/bits/types/__FILE.h | 1 | ||||
| -rw-r--r-- | include/bits/types/__mbstate_t.h | 1 | ||||
| -rw-r--r-- | include/bits/types/mbstate_t.h | 1 | ||||
| -rw-r--r-- | include/bits/types/wint_t.h | 1 | ||||
| -rw-r--r-- | include/bits/wctype-wchar.h | 1 | ||||
| -rw-r--r-- | include/stdio.h | 11 | ||||
| -rw-r--r-- | include/wchar.h | 10 | ||||
| -rw-r--r-- | include/wctype.h | 21 |
9 files changed, 17 insertions, 31 deletions
diff --git a/include/bits/types/FILE.h b/include/bits/types/FILE.h new file mode 100644 index 0000000000..09b599baa0 --- /dev/null +++ b/include/bits/types/FILE.h @@ -0,0 +1 @@ +#include <libio/bits/types/FILE.h> diff --git a/include/bits/types/__FILE.h b/include/bits/types/__FILE.h new file mode 100644 index 0000000000..236f60bacd --- /dev/null +++ b/include/bits/types/__FILE.h @@ -0,0 +1 @@ +#include <libio/bits/types/__FILE.h> diff --git a/include/bits/types/__mbstate_t.h b/include/bits/types/__mbstate_t.h new file mode 100644 index 0000000000..13e764e8c9 --- /dev/null +++ b/include/bits/types/__mbstate_t.h @@ -0,0 +1 @@ +#include <wcsmbs/bits/types/__mbstate_t.h> diff --git a/include/bits/types/mbstate_t.h b/include/bits/types/mbstate_t.h new file mode 100644 index 0000000000..99ec08a91a --- /dev/null +++ b/include/bits/types/mbstate_t.h @@ -0,0 +1 @@ +#include <wcsmbs/bits/types/mbstate_t.h> diff --git a/include/bits/types/wint_t.h b/include/bits/types/wint_t.h new file mode 100644 index 0000000000..f1e373d294 --- /dev/null +++ b/include/bits/types/wint_t.h @@ -0,0 +1 @@ +#include <wcsmbs/bits/types/wint_t.h> diff --git a/include/bits/wctype-wchar.h b/include/bits/wctype-wchar.h new file mode 100644 index 0000000000..8273cd743e --- /dev/null +++ b/include/bits/wctype-wchar.h @@ -0,0 +1 @@ +#include <wctype/bits/wctype-wchar.h> 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, diff --git a/include/wchar.h b/include/wchar.h index e2579a176a..6a7af27c47 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -1,8 +1,6 @@ #ifndef _WCHAR_H -#include <wcsmbs/wchar.h> - +# include <wcsmbs/wchar.h> # ifndef _ISOMAC -# ifdef _WCHAR_H extern __typeof (wcscasecmp_l) __wcscasecmp_l; extern __typeof (wcsncasecmp_l) __wcsncasecmp_l; @@ -216,10 +214,4 @@ extern size_t __mbsrtowcs_l (wchar_t *dst, const char **src, size_t len, # define __mbsinit(state) ((state)->__count == 0) # endif -# endif #endif - -/* Undefine all __need_* constants in case we are included to get those - constants but the whole file was already read. */ -#undef __need_mbstate_t -#undef __need_wint_t diff --git a/include/wctype.h b/include/wctype.h index a71b10377b..cd8af1a4db 100644 --- a/include/wctype.h +++ b/include/wctype.h @@ -1,18 +1,10 @@ #ifndef _WCTYPE_H +#include <wctype/wctype.h> #ifndef _ISOMAC -/* We try to get wint_t from <stddef.h>, but not all GCC versions define it - there. So define it ourselves if it remains undefined. */ -# define __need_wint_t -# include <stddef.h> -# ifndef _WINT_T -/* Integral type unchanged by default argument promotions that can - hold any value corresponding to members of the extended character - set, as well as at least one value that does not correspond to any - member of the extended character set. */ -# define _WINT_T -typedef unsigned int wint_t; -# endif + +#if 0 +#include <bits/types/wint_t.h> /* Need to repeat these prototypes here, as wctype/wctype.h defines all these as macros and thus we couldn't add libc_hidden_proto. */ @@ -25,6 +17,7 @@ extern int iswspace (wint_t __wc); extern int iswxdigit (wint_t __wc); extern wint_t towlower (wint_t __wc); extern wint_t towupper (wint_t __wc); +#endif libc_hidden_proto (iswalpha) libc_hidden_proto (iswalnum) @@ -34,11 +27,7 @@ libc_hidden_proto (iswspace) libc_hidden_proto (iswxdigit) libc_hidden_proto (towlower) libc_hidden_proto (towupper) -#endif - -#include <wctype/wctype.h> -#ifndef _ISOMAC /* Internal interfaces. */ extern int __iswspace (wint_t __wc); extern int __iswctype (wint_t __wc, wctype_t __desc); |