From: NAKAMURA Takumi Date: Tue, 19 Oct 2010 03:42:41 +0000 (+0000) Subject: lib/Headers/stddef.h: wint_t should be defined whenever is included with... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51f56fc36e6d441b6dd722cc09c4ac9f081c0974;p=clang lib/Headers/stddef.h: wint_t should be defined whenever is included with __need_wint_t. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116794 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Headers/stddef.h b/lib/Headers/stddef.h index 84ec1a7b4e..7cc0bc1a75 100644 --- a/lib/Headers/stddef.h +++ b/lib/Headers/stddef.h @@ -46,13 +46,16 @@ typedef __WCHAR_TYPE__ wchar_t; #define NULL ((void*)0) #endif -// Some C libraries expect to see a wint_t here. Others (notably MinGW) will use -// __WINT_TYPE__ directly; accomodate both by requiring __need_wint_t -#if defined(__need_wint_t) && !defined(_WINT_T) -#define _WINT_T -typedef __WINT_TYPE__ wint_t; -#endif - #define offsetof(t, d) __builtin_offsetof(t, d) #endif /* __STDDEF_H */ + +/* Some C libraries expect to see a wint_t here. Others (notably MinGW) will use +__WINT_TYPE__ directly; accomodate both by requiring __need_wint_t */ +#if defined(__need_wint_t) +#if !defined(_WINT_T) +#define _WINT_T +typedef __WINT_TYPE__ wint_t; +#endif /* _WINT_T */ +#undef __need_wint_t +#endif /* __need_wint_t */