[PATCH 1/2] inetcomm: Rename a typedef to prevent it from being shadowed.

[Michael Stefaniuc]

Quite a few functions use "internat" as parameter or local variable.
---
 dlls/inetcomm/mimeintl.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c
index 97b482e..187f1c5 100644
--- a/dlls/inetcomm/mimeintl.c
+++ b/dlls/inetcomm/mimeintl.c
@@ -56,11 +56,11 @@ typedef struct
     struct list charsets;
     LONG next_charset_handle;
     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)
@@ -85,13 +85,13 @@ static HRESULT WINAPI MimeInternat_QueryInterface( IMimeInternational *iface, RE
 
 static ULONG WINAPI MimeInternat_AddRef( IMimeInternational *iface )
 {
-    internat *This = impl_from_IMimeInternational( iface );
+    internat_impl *This = impl_from_IMimeInternational( iface );
     return InterlockedIncrement(&This->refs);
 }
 
 static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface )
 {
-    internat *This = impl_from_IMimeInternational( iface );
+    internat_impl *This = impl_from_IMimeInternational( iface );
     ULONG 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)
 {
-    internat *This = impl_from_IMimeInternational( iface );
+    internat_impl *This = impl_from_IMimeInternational( iface );
 
     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)
 {
-    internat *This = impl_from_IMimeInternational( iface );
+    internat_impl *This = impl_from_IMimeInternational( iface );
     HRESULT hr = S_OK;
 
     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,
                                                LPHCHARSET phCharset)
 {
-    internat *This = impl_from_IMimeInternational( iface );
+    internat_impl *This = impl_from_IMimeInternational( iface );
     HRESULT hr = MIME_E_NOT_FOUND;
     charset_entry *charset;
 
@@ -278,7 +278,7 @@ static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR
 static HRESULT WINAPI MimeInternat_GetCharsetInfo(IMimeInternational *iface, HCHARSET hCharset,
                                                   LPINETCSETINFO pCsetInfo)
 {
-    internat *This = impl_from_IMimeInternational( iface );
+    internat_impl *This = impl_from_IMimeInternational( iface );
     HRESULT hr = MIME_E_INVALID_HANDLE;
     charset_entry *charset;
 
@@ -519,7 +519,7 @@ static IMimeInternationalVtbl mime_internat_vtbl =
     MimeInternat_Rfc1522Encode
 };
 
-static internat *global_internat;
+static internat_impl *global_internat;
 
 HRESULT MimeInternational_Construct(IMimeInternational **internat)
 {
-- 
1.7.5.4