system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

msvcp60: Make some codecvt_xxx() functions static or remove them.

Browse source
This commit is contained in:
Francois Gouget 2012-11-22 18:38:39 +01:00 committed by Alexandre Julliard
parent 479b7bcf60
commit ebd28d5034
2 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dlls/msvcp60/locale.c
View file

@ -2551,15 +2551,6 @@ int __thiscall codecvt_char_do_unshift(const codecvt_char *this,
return CODECVT_noconv;
}
/* ?unshift@?$codecvt@DDH@std@@QBEHAAHPAD1AAPAD@Z */
/* ?unshift@?$codecvt@DDH@std@@QEBAHAEAHPEAD1AEAPEAD@Z */
int codecvt_char_unshift(const codecvt_char *this,
int *state, char *to, char *to_end, char **to_next)
{
TRACE("(%p %p %p %p %p)\n", this, state, to, to_end, to_next);
return call_codecvt_char_do_unshift(this, state, to, to_end, to_next);
}
/* ?do_length@?$codecvt@DDH@std@@MBEHABHPBD1I@Z */
/* ?do_length@?$codecvt@DDH@std@@MEBAHAEBHPEBD1_K@Z */
#define call_codecvt_char_do_length(this, state, from, from_end, max) CALL_VTBL_FUNC(this, 28, \
@ -2696,7 +2687,7 @@ static MSVCP_size_t codecvt_wchar__Getcat(const locale_facet **facet, const loca
return LC_CTYPE;
}
codecvt_wchar* codecvt_wchar_use_facet(const locale *loc)
static codecvt_wchar* codecvt_wchar_use_facet(const locale *loc)
{
static codecvt_wchar *obj = NULL;
@ -2926,17 +2917,6 @@ int __thiscall codecvt_wchar_do_unshift(const codecvt_wchar *this,
return CODECVT_ok;
}
/* ?unshift@?$codecvt@GDH@std@@QBEHAAHPAD1AAPAD@Z */
/* ?unshift@?$codecvt@GDH@std@@QEBAHAEAHPEAD1AEAPEAD@Z */
/* ?unshift@?$codecvt@_WDH@std@@QBEHAAHPAD1AAPAD@Z */
/* ?unshift@?$codecvt@_WDH@std@@QEBAHAEAHPEAD1AEAPEAD@Z */
int codecvt_wchar_unshift(const codecvt_wchar *this,
int *state, char *to, char *to_end, char **to_next)
{
TRACE("(%p %p %p %p %p)\n", this, state, to, to_end, to_next);
return call_codecvt_wchar_do_unshift(this, state, to, to_end, to_next);
}
/* ?do_length@?$codecvt@GDH@std@@MBEHABHPBD1I@Z */
/* ?do_length@?$codecvt@GDH@std@@MEBAHAEBHPEBD1_K@Z */
/* ?do_length@?$codecvt@_WDH@std@@MBEHABHPBD1I@Z */

3
dlls/msvcp60/msvcp.h
View file

@ -107,7 +107,6 @@ typedef struct {
} codecvt_char;
MSVCP_bool __thiscall codecvt_base_always_noconv(const codecvt_base*);
int codecvt_char_unshift(const codecvt_char*, int*, char*, char*, char**);
int __thiscall codecvt_char_out(const codecvt_char*, int*, const char*,
const char*, const char**, char*, char*, char**);
int __thiscall codecvt_char_in(const codecvt_char*, int*, const char*,
@ -125,7 +124,6 @@ typedef struct {
_Cvtvec cvt;
} codecvt_wchar;
int codecvt_wchar_unshift(const codecvt_wchar*, int*, char*, char*, char**);
int __thiscall codecvt_wchar_out(const codecvt_wchar*, int*, const wchar_t*,
const wchar_t*, const wchar_t**, char*, char*, char**);
int __thiscall codecvt_wchar_in(const codecvt_wchar*, int*, const char*,
@ -171,7 +169,6 @@ void __thiscall locale_dtor(locale*);
void free_locale(void);
locale* __thiscall locale__Addfac(locale*, locale_facet*, MSVCP_size_t, MSVCP_size_t);
codecvt_char* codecvt_char_use_facet(const locale*);
codecvt_wchar* codecvt_wchar_use_facet(const locale*);
codecvt_wchar* codecvt_short_use_facet(const locale*);
ctype_char* ctype_char_use_facet(const locale*);
ctype_wchar* ctype_wchar_use_facet(const locale*);