From 67d3295fc67d6684ad02ddd16698d80381e40021 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Sat, 14 Mar 2009 01:13:03 +0000 Subject: [PATCH] Import a part of mingw-w64's "ctype.h" into our "ctype.h" This way we can already remove one modification I did to the original mingw-w64 CRT initialization code Thanks to Timo for the hint svn path=/trunk/; revision=40007 --- reactos/include/crt/ctype.h | 14 ++++++++++++++ reactos/include/reactos/mingw-w64/internal.h | 2 -- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/reactos/include/crt/ctype.h b/reactos/include/crt/ctype.h index 4c899ac608c..d881539be31 100644 --- a/reactos/include/crt/ctype.h +++ b/reactos/include/crt/ctype.h @@ -48,6 +48,20 @@ extern "C" { # endif /* !_CTYPE_DISABLE_MACROS */ #endif /* !_CRT_WCTYPEDATA_DEFINED */ + /* CRT stuff */ +#if 1 + extern const unsigned char __newclmap[]; + extern const unsigned char __newcumap[]; + extern pthreadlocinfo __ptlocinfo; + extern pthreadmbcinfo __ptmbcinfo; + extern int __globallocalestatus; + extern int __locale_changed; + extern struct threadlocaleinfostruct __initiallocinfo; + extern _locale_tstruct __initiallocalestructinfo; + pthreadlocinfo __cdecl __updatetlocinfo(void); + pthreadmbcinfo __cdecl __updatetmbcinfo(void); +#endif + #define _UPPER 0x1 #define _LOWER 0x2 #define _DIGIT 0x4 diff --git a/reactos/include/reactos/mingw-w64/internal.h b/reactos/include/reactos/mingw-w64/internal.h index 8786e25bbc6..10b637f1b88 100644 --- a/reactos/include/reactos/mingw-w64/internal.h +++ b/reactos/include/reactos/mingw-w64/internal.h @@ -166,8 +166,6 @@ extern char **_imp___wcmdln; PIMAGE_SECTION_HEADER __cdecl _FindPESection (PBYTE pImageBase, DWORD_PTR rva); BOOL __cdecl _IsNonwritableInCurrentImage (PBYTE pTarget); - extern int __globallocalestatus; - #ifdef __cplusplus } #endif