inetcomm: Rename a typedef to prevent it from being shadowed.

This commit is contained in:
Michael Stefaniuc 2011-06-05 23:39:17 +02:00 committed by Alexandre Julliard
parent b856884c3b
commit a052e29556

View File

@ -56,11 +56,11 @@ typedef struct
struct list charsets; struct list charsets;
LONG next_charset_handle; LONG next_charset_handle;
HCHARSET default_charset; HCHARSET default_charset;
} internat; } internat_impl;
static inline internat *impl_from_IMimeInternational( IMimeInternational *iface ) static inline internat_impl *impl_from_IMimeInternational( IMimeInternational *iface )
{ {
return (internat *)((char*)iface - FIELD_OFFSET(internat, lpVtbl)); return (internat_impl *)((char*)iface - FIELD_OFFSET(internat_impl, lpVtbl));
} }
static inline HRESULT get_mlang(IMultiLanguage **ml) static inline HRESULT get_mlang(IMultiLanguage **ml)
@ -85,13 +85,13 @@ static HRESULT WINAPI MimeInternat_QueryInterface( IMimeInternational *iface, RE
static ULONG WINAPI MimeInternat_AddRef( IMimeInternational *iface ) static ULONG WINAPI MimeInternat_AddRef( IMimeInternational *iface )
{ {
internat *This = impl_from_IMimeInternational( iface ); internat_impl *This = impl_from_IMimeInternational( iface );
return InterlockedIncrement(&This->refs); return InterlockedIncrement(&This->refs);
} }
static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface ) static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface )
{ {
internat *This = impl_from_IMimeInternational( iface ); internat_impl *This = impl_from_IMimeInternational( iface );
ULONG refs; ULONG refs;
refs = InterlockedDecrement(&This->refs); refs = InterlockedDecrement(&This->refs);
@ -112,7 +112,7 @@ static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface )
static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, HCHARSET hCharset) static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, HCHARSET hCharset)
{ {
internat *This = impl_from_IMimeInternational( iface ); internat_impl *This = impl_from_IMimeInternational( iface );
TRACE("(%p)->(%p)\n", iface, hCharset); TRACE("(%p)->(%p)\n", iface, hCharset);
@ -126,7 +126,7 @@ static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface,
static HRESULT WINAPI MimeInternat_GetDefaultCharset(IMimeInternational *iface, LPHCHARSET phCharset) static HRESULT WINAPI MimeInternat_GetDefaultCharset(IMimeInternational *iface, LPHCHARSET phCharset)
{ {
internat *This = impl_from_IMimeInternational( iface ); internat_impl *This = impl_from_IMimeInternational( iface );
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE("(%p)->(%p)\n", iface, phCharset); TRACE("(%p)->(%p)\n", iface, phCharset);
@ -238,7 +238,7 @@ static HCHARSET add_charset(struct list *list, MIMECSETINFO *mlang_info, HCHARSE
static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR pszCharset, static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR pszCharset,
LPHCHARSET phCharset) LPHCHARSET phCharset)
{ {
internat *This = impl_from_IMimeInternational( iface ); internat_impl *This = impl_from_IMimeInternational( iface );
HRESULT hr = MIME_E_NOT_FOUND; HRESULT hr = MIME_E_NOT_FOUND;
charset_entry *charset; charset_entry *charset;
@ -278,7 +278,7 @@ static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR
static HRESULT WINAPI MimeInternat_GetCharsetInfo(IMimeInternational *iface, HCHARSET hCharset, static HRESULT WINAPI MimeInternat_GetCharsetInfo(IMimeInternational *iface, HCHARSET hCharset,
LPINETCSETINFO pCsetInfo) LPINETCSETINFO pCsetInfo)
{ {
internat *This = impl_from_IMimeInternational( iface ); internat_impl *This = impl_from_IMimeInternational( iface );
HRESULT hr = MIME_E_INVALID_HANDLE; HRESULT hr = MIME_E_INVALID_HANDLE;
charset_entry *charset; charset_entry *charset;
@ -519,7 +519,7 @@ static IMimeInternationalVtbl mime_internat_vtbl =
MimeInternat_Rfc1522Encode MimeInternat_Rfc1522Encode
}; };
static internat *global_internat; static internat_impl *global_internat;
HRESULT MimeInternational_Construct(IMimeInternational **internat) HRESULT MimeInternational_Construct(IMimeInternational **internat)
{ {