Author: tkreuzer Date: Fri Aug 6 22:42:07 2010 New Revision: 48473
URL: http://svn.reactos.org/svn/reactos?rev=48473&view=rev Log: [CRT] - Remove "implementations" of __lc_collate_cp, __lc_handle and __lc_codepage. These are not functions, but varuables, implemented as MSVCRT_* - add ___lc_codepage_func and ___lc_handle_func taken from wine - Fix msvcrt spec file - Fixes compilation with gcc 4.5.1
Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/crt/locale/locale.c
Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.spe... ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Fri Aug 6 22:42:07 2010 @@ -126,9 +126,9 @@ @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast @ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid @ cdecl __STRINGTOLD(ptr ptr str long) -# @ cdecl ___lc_codepage_func() +@ cdecl ___lc_codepage_func() # @ cdecl ___lc_collate_cp_func() -# @ cdecl ___lc_handle_func() +@ cdecl ___lc_handle_func() # @ cdecl ___mb_cur_max_func() MSVCRT___mb_cur_max_func @ cdecl ___setlc_active_func() @ cdecl ___unguarded_readlc_active_add_func() @@ -151,10 +151,10 @@ @ cdecl __isascii(long) __isascii @ cdecl __iscsym(long) __iscsym @ cdecl __iscsymf(long) __iscsymf -@ extern __lc_codepage __lc_codepage +@ extern __lc_codepage MSVCRT___lc_codepage @ stub __lc_collate -@ extern __lc_collate_cp __lc_collate_cp -@ extern __lc_handle __lc_handle +@ extern __lc_collate_cp MSVCRT___lc_collate_cp +@ extern __lc_handle MSVCRT___lc_handle @ cdecl __lconv_init() # stub __libm_sse2_acos # stub __libm_sse2_acosf
Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.c... ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Fri Aug 6 22:42:07 2010 @@ -755,38 +755,20 @@
/********************************************************************* - * __lc_collate_cp (MSVCRT.@) - * - * @unimplemented - */ -void __lc_collate_cp(int cp) -{ -FIXME("__lc_collate_cp - stub\n"); -return; -} - - -/********************************************************************* - * __lc_handle (MSVCRT.@) - * - * @unimplemented - */ -void __lc_handle(void) -{ -FIXME("__lc_handle - stub\n"); -return; -} - - -/********************************************************************* - * __lc_codepage (MSVCRT.@) - * - * @unimplemented - */ -void __lc_codepage(void) -{ -FIXME("__lc_codepage - stub\n"); -return; + * ___lc_handle_func (MSVCRT.@) + */ +HANDLE * CDECL ___lc_handle_func(void) +{ + return MSVCRT___lc_handle; +} + + +/********************************************************************* + * ___lc_codepage_func (MSVCRT.@) + */ +int CDECL ___lc_codepage_func(void) +{ + return MSVCRT___lc_codepage; }