meesbs
/
tinycc
forked from Mirrors/tinycc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Declare wint_t in <stddef.h> when needed 

Some old glibcs <wctype.h> require <stddef.h> to provide
wint_t, accomodate them.
master
Michael Matz 2014-04-07 00:26:36 +02:00
parent 0e43f3aef4
commit 0961a38493
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/stddef.h
View File

@ -26,3 +26,18 @@ typedef unsigned long long int uint64_t;
void *alloca(size_t size);
#endif
/* Older glibc require a wint_t from <stddef.h> (when requested
by __need_wint_t, as otherwise stddef.h isn't allowed to
define this type). Note that this must be outside the normal
_STDDEF_H guard, so that it works even when we've included the file
already (without requring wint_t). Some other libs define _WINT_T
if they've already provided that type, so we can use that as guard.
TCC defines __WINT_TYPE__ for us. */
#if defined (__need_wint_t)
#ifndef _WINT_T
#define _WINT_T
typedef __WINT_TYPE__ wint_t;
#endif
#undef __need_wint_t
#endif

9
libtcc.c
View File

@ -988,8 +988,17 @@ LIBTCCAPI TCCState *tcc_new(void)
#ifdef TCC_TARGET_PE
tcc_define_symbol(s, "__WCHAR_TYPE__", "unsigned short");
tcc_define_symbol(s, "__WINT_TYPE__", "unsigned short");
#else
tcc_define_symbol(s, "__WCHAR_TYPE__", "int");
/* wint_t is unsigned int by default, but (signed) int on BSDs
and unsigned short on windows. Other OSes might have still
other conventions, sigh. */
#if defined(__FreeBSD__) || defined (__FreeBSD_kernel__)
tcc_define_symbol(s, "__WINT_TYPE__", "int");
#else
tcc_define_symbol(s, "__WINT_TYPE__", "unsigned int");
#endif
#endif
#ifndef TCC_TARGET_PE