[ros-diffs] [cfinck] 40007: 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

cfinck at svn.reactos.org cfinck at svn.reactos.org
Sat Mar 14 02:13:04 CET 2009


Author: cfinck
Date: Sat Mar 14 04:13:03 2009
New Revision: 40007

URL: http://svn.reactos.org/svn/reactos?rev=40007&view=rev
Log:
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

Modified:
    trunk/reactos/include/crt/ctype.h
    trunk/reactos/include/reactos/mingw-w64/internal.h

Modified: trunk/reactos/include/crt/ctype.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=40007&r1=40006&r2=40007&view=diff
==============================================================================
--- trunk/reactos/include/crt/ctype.h [iso-8859-1] (original)
+++ trunk/reactos/include/crt/ctype.h [iso-8859-1] Sat Mar 14 04:13:03 2009
@@ -47,6 +47,20 @@
 #  endif /* !_M_CEE_PURE */
 # 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

Modified: trunk/reactos/include/reactos/mingw-w64/internal.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/internal.h?rev=40007&r1=40006&r2=40007&view=diff
==============================================================================
--- trunk/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] Sat Mar 14 04:13:03 2009
@@ -166,8 +166,6 @@
   PIMAGE_SECTION_HEADER __cdecl _FindPESection (PBYTE pImageBase, DWORD_PTR rva);
   BOOL __cdecl _IsNonwritableInCurrentImage (PBYTE pTarget);
 
-  extern int __globallocalestatus;
-
 #ifdef __cplusplus
 }
 #endif



More information about the Ros-diffs mailing list