From 71a40c74716aa19ddb181391c0583f55bb491c2f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 26 May 1996 22:09:13 +0000 Subject: * time/Makefile (tzcompile): Add missing backslash. * wctype/wctype.h (__need_wint_t): Define this and include stddef.h. [! _WINT_T] (wint_t): Conditionalize typedef on this in case pre-2.7.3 stddef.h doesn't define it. * wcsmbs/wchar.h: Likewise. * stdlib/strtod.c: Likewise. * wcsmbs/wcstok.c: Fix argument name typo. --- wcsmbs/wchar.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'wcsmbs/wchar.h') diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index b54170c3f3..cc821b8a50 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -34,6 +34,19 @@ __BEGIN_DECLS #define __need_NULL #include + +/* We try to get wint_t from , but not all GCC versions define it + there. So define it ourselves if it remains undefined. */ +#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 + + /* Conversion state information. */ typedef int mbstate_t; /* FIXME */ @@ -44,15 +57,6 @@ typedef int mbstate_t; /* FIXME */ # define WEOF (0xffffffffu) #endif -#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 1 -typedef unsigned int wint_t; -#endif - /* Copy SRC to DEST. */ extern wchar_t *wcscpy __P ((wchar_t *__dest, __const wchar_t *__src)); -- cgit v1.2.3