- 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

svn path=/trunk/; revision=48473
This commit is contained in:
Timo Kreuzer 2010-08-06 22:42:07 +00:00
parent d521bf4480
commit 003e0bb556
2 changed files with 11 additions and 29 deletions

View file

@ -126,9 +126,9 @@
@ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast
@ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid @ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid
@ cdecl __STRINGTOLD(ptr ptr str long) @ cdecl __STRINGTOLD(ptr ptr str long)
# @ cdecl ___lc_codepage_func() @ cdecl ___lc_codepage_func()
# @ cdecl ___lc_collate_cp_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 ___mb_cur_max_func() MSVCRT___mb_cur_max_func
@ cdecl ___setlc_active_func() @ cdecl ___setlc_active_func()
@ cdecl ___unguarded_readlc_active_add_func() @ cdecl ___unguarded_readlc_active_add_func()
@ -151,10 +151,10 @@
@ cdecl __isascii(long) __isascii @ cdecl __isascii(long) __isascii
@ cdecl __iscsym(long) __iscsym @ cdecl __iscsym(long) __iscsym
@ cdecl __iscsymf(long) __iscsymf @ cdecl __iscsymf(long) __iscsymf
@ extern __lc_codepage __lc_codepage @ extern __lc_codepage MSVCRT___lc_codepage
@ stub __lc_collate @ stub __lc_collate
@ extern __lc_collate_cp __lc_collate_cp @ extern __lc_collate_cp MSVCRT___lc_collate_cp
@ extern __lc_handle __lc_handle @ extern __lc_handle MSVCRT___lc_handle
@ cdecl __lconv_init() @ cdecl __lconv_init()
# stub __libm_sse2_acos # stub __libm_sse2_acos
# stub __libm_sse2_acosf # stub __libm_sse2_acosf

View file

@ -755,38 +755,20 @@ int CDECL _setmbcp(int cp)
/********************************************************************* /*********************************************************************
* __lc_collate_cp (MSVCRT.@) * ___lc_handle_func (MSVCRT.@)
*
* @unimplemented
*/ */
void __lc_collate_cp(int cp) HANDLE * CDECL ___lc_handle_func(void)
{ {
FIXME("__lc_collate_cp - stub\n"); return MSVCRT___lc_handle;
return;
} }
/********************************************************************* /*********************************************************************
* __lc_handle (MSVCRT.@) * ___lc_codepage_func (MSVCRT.@)
*
* @unimplemented
*/ */
void __lc_handle(void) int CDECL ___lc_codepage_func(void)
{ {
FIXME("__lc_handle - stub\n"); return MSVCRT___lc_codepage;
return;
}
/*********************************************************************
* __lc_codepage (MSVCRT.@)
*
* @unimplemented
*/
void __lc_codepage(void)
{
FIXME("__lc_codepage - stub\n");
return;
} }